diff options
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/build-tools.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/cpp.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/databases.scm | 254 | ||||
| -rw-r--r-- | gnu/packages/dbm.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/diffoscope.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/icu4c.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/kde-plasma.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/libreoffice.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/logging.scm | 19 | ||||
| -rw-r--r-- | gnu/packages/prolog.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/rocm.scm | 28 |
13 files changed, 104 insertions, 284 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4ca7998cc7..e14d74b186 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12324,7 +12324,7 @@ of these reads to align data quickly through a hash-based indexing scheme.") (define-public sortmerna (package (name "sortmerna") - (version "4.3.4") + (version "4.3.7") (source (origin (method git-fetch) @@ -12334,7 +12334,7 @@ of these reads to align data quickly through a hash-based indexing scheme.") (file-name (git-file-name name version)) (sha256 (base32 - "0f8jfc8vsq6llhbb92p9yv7nbp566yqwfcmq3g2hw0n7d8hyl3a8")))) + "14p3zi6ysnrs2l33r5mc0fr0la2jnnxmqdcif02fppln8w31j753")))) (build-system cmake-build-system) (outputs '("out" ;for binaries "db")) ;for sequence databases @@ -12359,6 +12359,11 @@ of these reads to align data quickly through a hash-based indexing scheme.") "/include")) #:phases '(modify-phases %standard-phases + (add-after 'unpack 'fix-includes + (lambda _ + (substitute* "src/sortmerna/kseq_load.cpp" + (("#include <iostream>" all) + (string-append all "\n#include <cstdint>"))))) (add-after 'unpack 'find-concurrentqueue-headers (lambda* (#:key inputs #:allow-other-keys) ;; Ensure that headers can be found diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 7121cec4d4..170d32f3e3 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -129,7 +129,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "3.1.4") + (version "3.1.6") (source (origin (method git-fetch) @@ -138,7 +138,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x99d2cycgxay62cz2ypjjkmjgrbdvz5d3pg4fyv0gnq2srnlcnm")))) + (base32 "0pnrsnwvsqby0vgb33zsrjznb7l82ji7i4aigk32hg3rl674qqvx")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -157,15 +157,15 @@ makes a few sacrifices to acquire fast full and incremental build times.") (invoke "ctest"))))))) (inputs `(("c-ares" ,c-ares) - ("fmt" ,fmt-8) + ("fmt" ,fmt-9) ("grpc" ,grpc) ("nlohmann-json" ,nlohmann-json) ("protobuf" ,protobuf) ("python" ,python-wrapper) ("re2" ,re2) - ("spdlog" ,spdlog-1.10))) + ("spdlog" ,spdlog-1.13))) (native-inputs - `(("abseil-cpp" ,abseil-cpp-cxxstd11) + `(("abseil-cpp" ,abseil-cpp) ("googletest" ,googletest) ("openssl" ,openssl) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3832b67aec..2f5b5b71b2 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2202,6 +2202,15 @@ Google's C++ code base.") #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) +(define-public abseil-cpp-cxxstd17 + (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? + +(define-public abseil-cpp-cxxstd11 + (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11 + +(define-public static-abseil-cpp + (make-static-abseil-cpp abseil-cpp)) + (define-public miniaudio (package (name "miniaudio") @@ -2262,15 +2271,6 @@ Google's C++ code base.") made up of a single source file and has no external dependencies.") (license license:expat))) -(define-public abseil-cpp-cxxstd17 - (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? - -(define-public abseil-cpp-cxxstd11 - (abseil-cpp-for-c++-standard abseil-cpp-20220623 11)) ;last version on C++11 - -(define-public static-abseil-cpp - (make-static-abseil-cpp abseil-cpp)) - (define-public pegtl (package (name "pegtl") diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2bfa37ea90..35322b7ad1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -309,41 +309,37 @@ ElasticSearch server") (define-public firebird (package (name "firebird") - (version "3.0.12") + (version "3.0.13") (source - (let ((revision "33787-0")) - (origin - (method url-fetch) - (uri (string-append "https://github.com/FirebirdSQL/" - "firebird/releases/download/v" - version "/" - "Firebird-" version "." revision ".tar.bz2")) - (sha256 - (base32 "07w109k237slwyhgyxma9r5my0dkvksc7ykpw0a4h7gpv06vzcl5")) - (patches (search-patches "firebird-riscv64-support-pt1.patch" - "firebird-riscv64-support-pt2.patch")) - (modules '((guix build utils))) - (snippet - `(begin - (for-each - delete-file-recursively - (list "extern/btyacc/test" ; TODO: package and remove entirely - "extern/editline" - "extern/icu" - "extern/libtommath" - "extern/zlib" - "src/include/firebird/impl/boost" + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FirebirdSQL/firebird") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h697y53vk7yvlifr35vjl3vkv8m5ny7j05r70qnqcvjy0axqbdn")) + (patches (search-patches "firebird-riscv64-support-pt1.patch" + "firebird-riscv64-support-pt2.patch")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each + delete-file-recursively + (list "extern/btyacc/test" ; TODO: package and remove entirely + "extern/editline" + "extern/icu" + "extern/libtommath" + "extern/zlib" + "src/include/firebird/impl/boost" - ;; Missing licence. - "builds/install/arch-specific/solaris" - "extern/SfIO" - "src/msgs/templates.sql" + ;; Missing licence. + "builds/install/arch-specific/solaris" + "extern/SfIO" + "src/msgs/templates.sql" - ;; Generated files missing sources. - "doc/Firebird-3-QuickStart.pdf" - (string-append "doc/Firebird-" ,version - "-ReleaseNotes.pdf") - "doc/README.SecureRemotePassword.html"))))))) + ;; Generated files missing sources. + "doc/README.SecureRemotePassword.html")))))) (build-system gnu-build-system) (outputs (list "debug" "out")) (arguments @@ -445,13 +441,11 @@ ElasticSearch server") (list "include/firebird/impl" "lib/firebird/plugins/udr"))))))))) (native-inputs - (if (target-riscv64?) - (list autoconf automake libtool) - '())) + (list autoconf automake libtool)) (inputs (list boost editline - icu4c-71 + icu4c-77 libtommath ncurses zlib)) @@ -1996,7 +1990,7 @@ including field and record folding.") (define-public rocksdb (package (name "rocksdb") - (version "6.26.1") + (version "10.4.2") (source (origin (method git-fetch) (uri (git-reference @@ -2005,7 +1999,7 @@ including field and record folding.") (file-name (git-file-name name version)) (sha256 (base32 - "0mylma106w93kxhj89g9y1ccdq7m9m94wrmv5nyr17yc1zsk87sg")) + "1cgr33qv639fyx067sg8nsy8mnfac9xgmmw2qwi2bcmir777ma4q")) (modules '((guix build utils))) (snippet '(begin @@ -5425,132 +5419,6 @@ language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.") (license license:asl2.0))) -(define-public apache-arrow-0.16 - (package - (name "apache-arrow") - (version "0.16.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/apache/arrow") - (commit (string-append "apache-arrow-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15bplqy5708bxy1mynzjkd3d2g8v2wd36z8l0ap8yyyq54l3gdvy")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'enter-source-directory - (lambda _ - (chdir "cpp") - (substitute* "src/parquet/CMakeLists.txt" - ((" parquet_constants.cpp") "") - (("set\\(THRIFT_OUTPUT_FILES \\$\\{THRIFT_OUTPUT_FILES\\}.*") "") - ((".*\"\\$\\{THRIFT_OUTPUT_DIR\\}/parquet_constants.cpp\"\\).*") "")))) - (add-after 'unpack 'set-env - (lambda _ - (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) - (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) - (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) - (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson"))))) - #:build-type "Release" - #:configure-flags - (list "-DARROW_PYTHON=ON" - "-DARROW_GLOG=ON" - "-DARROW_SSE42=OFF" - "-DARROW_BOOST_USE_SHARED=ON" - ;; Parquet options - "-DARROW_PARQUET=ON" - - ;; The maintainers disallow using system versions of - ;; jemalloc: - ;; https://issues.apache.org/jira/browse/ARROW-3507. This - ;; is unfortunate because jemalloc increases performance: - ;; https://arrow.apache.org/blog/2018/07/20/jemalloc/. - "-DARROW_JEMALLOC=OFF" - - ;; The CMake option ARROW_DEPENDENCY_SOURCE is a global - ;; option that instructs the build system how to resolve - ;; each dependency. SYSTEM = Finding the dependency in - ;; system paths using CMake's built-in find_package - ;; function, or using pkg-config for packages that do not - ;; have this feature - "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - - ;; Split output into its component packages. - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out")) - (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") - "/lib") - (string-append "-DCMAKE_INSTALL_BINDIR=" - (assoc-ref %outputs "out") - "/bin") - (string-append "-DCMAKE_INSTALL_INCLUDEDIR=" - (assoc-ref %outputs "include") - "/share/include") - - - "-DARROW_WITH_SNAPPY=ON" - "-DARROW_WITH_ZLIB=ON" - "-DARROW_WITH_ZSTD=ON" - "-DARROW_WITH_LZ4=ON" - "-DARROW_COMPUTE=ON" - "-DARROW_CSV=ON" - "-DARROW_DATASET=ON" - "-DARROW_FILESYSTEM=ON" - "-DARROW_HDFS=ON" - "-DARROW_JSON=ON" - ;; Arrow Python C++ integration library (required for - ;; building pyarrow). This library must be built against - ;; the same Python version for which you are building - ;; pyarrow. NumPy must also be installed. Enabling this - ;; option also enables ARROW_COMPUTE, ARROW_CSV, - ;; ARROW_DATASET, ARROW_FILESYSTEM, ARROW_HDFS, and - ;; ARROW_JSON. - "-DARROW_PYTHON=ON" - - ;; Building the tests forces on all the - ;; optional features and the use of static - ;; libraries. - "-DARROW_BUILD_TESTS=OFF" - "-DBENCHMARK_ENABLE_GTEST_TESTS=OFF" - ;;"-DBENCHMARK_ENABLE_TESTING=OFF" - "-DARROW_BUILD_STATIC=OFF"))) - (inputs - `(("boost" ,boost) - ("brotli" ,brotli) - ("double-conversion" ,double-conversion) - ("snappy" ,snappy) - ("gflags" ,gflags) - ("glog" ,glog) - ("apache-thrift" ,apache-thrift "lib") - ("protobuf" ,protobuf) - ("rapidjson" ,rapidjson) - ("zlib" ,zlib) - ("bzip2" ,bzip2) - ("lz4" ,lz4) - ("zstd" ,zstd "lib") - ("re2" ,re2) - ("grpc" ,grpc) - ("python-3" ,python) - ("python-numpy" ,python-numpy))) - (native-inputs - (list pkg-config apache-thrift)) - (outputs '("out" "include")) - (home-page "https://arrow.apache.org/") - (synopsis "Columnar in-memory analytics") - (description "Apache Arrow is a columnar in-memory analytics layer -designed to accelerate big data. It houses a set of canonical in-memory -representations of flat and hierarchical data along with multiple -language-bindings for structure manipulation. It also provides IPC and common -algorithm implementations.") - (license license:asl2.0))) - (define-public python-pyarrow (package (inherit apache-arrow) @@ -5619,64 +5487,6 @@ implementation, along with tools for interoperability with pandas, NumPy, and other traditional Python scientific computing packages.") (license license:asl2.0))) -(define-public python-pyarrow-0.16 - (package - (inherit apache-arrow-0.16) - (name "python-pyarrow") - (build-system python-build-system) - (arguments - '(#:tests? #f ; XXX There are no tests in the "python" directory - #:phases - (modify-phases %standard-phases - (delete 'build) ; XXX the build is performed again during the install phase - (add-after 'unpack 'enter-source-directory - (lambda _ (chdir "python"))) - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (add-before 'install 'patch-cmake-variables - (lambda* (#:key inputs #:allow-other-keys) - ;; Replace cmake locations with hardcoded guix links for the - ;; underlying C++ library and headers. This is a pretty awful - ;; hack. - (substitute* "cmake_modules/FindParquet.cmake" - (("# Licensed to the Apache Software Foundation" m) - (string-append "set(PARQUET_INCLUDE_DIR \"" - (assoc-ref inputs "apache-arrow:include") - "/share/include\")\n" m)) - (("find_package_handle_standard_args" m) - (string-append "set(PARQUET_LIB_DIR \"" - (assoc-ref inputs "apache-arrow:lib") - "/lib\")\n" m))))) - (add-before 'install 'patch-parquet-library - (lambda _ - (substitute* "CMakeLists.txt" - (("parquet_shared") "parquet")))) - (add-before 'install 'set-PYARROW_WITH_PARQUET - (lambda _ - (setenv "PYARROW_WITH_PARQUET" "1")))))) - (propagated-inputs - `(("apache-arrow:lib" ,apache-arrow-0.16) - ("apache-arrow:include" ,apache-arrow-0.16 "include") - ("python-numpy" ,python-numpy) - ("python-pandas" ,python-pandas) - ("python-six" ,python-six))) - (native-inputs - (list cmake-minimal - pkg-config - python-cython - python-pytest - python-pytest-runner - python-setuptools-scm)) - (outputs '("out")) - (home-page "https://arrow.apache.org/docs/python/") - (synopsis "Python bindings for Apache Arrow") - (description - "This library provides a Pythonic API wrapper for the reference Arrow C++ -implementation, along with tools for interoperability with pandas, NumPy, and -other traditional Python scientific computing packages.") - (license license:asl2.0))) - (define-public python-fastparquet (package (name "python-fastparquet") diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index da5db84b41..97b2bded46 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2016, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2025 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2018, 2020, 2021, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> @@ -91,7 +91,9 @@ #:out-of-source? #true #:configure-flags #~(list - "CFLAGS=-g -O2 -Wno-error=implicit-function-declaration" + #$@(if (target-ppc64le?) + #~("CFLAGS=-g -O2 -Wno-error=implicit-function-declaration -fpermissive") + #~("CFLAGS=-g -O2 -Wno-error=implicit-function-declaration")) ;; Remove 7 MiB of .a files. "--disable-static" diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 4d1121f476..a5b371a099 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -78,7 +78,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "302") + (version "303") (source (origin (method git-fetch) @@ -87,7 +87,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1h7qkmy8q2l864f4vlpxclxljh7dqr51pwvwra5lfr92bjcy5mdr")))) + (base32 "1asrhbba9jrk7vibr89s03sy0kac0bhh9ddp0gy45zffhhflnxb5")))) (build-system pyproject-build-system) (arguments (list @@ -210,6 +210,7 @@ html2text imagemagick libarchive + libcaca llvm lz4 lzip diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index d322fb6c3e..f473527449 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -124,7 +124,7 @@ globalisation support for software applications. This package contains the C/C++ part.") (license x11) - (home-page "http://site.icu-project.org/"))) + (home-page "https://icu.unicode.org/"))) (define-public icu4c icu4c-73) @@ -164,6 +164,18 @@ C/C++ part.") (base32 "0gjg1zrnqk4vmidqgqx4xbz05898px212gnff8242is7zrmv9b6z")))))) +(define-public icu4c-77 + (package + (inherit icu4c) + (name "icu4c") + (version "77.1") + (source (origin + (method url-fetch) + (uri (icu4c-uri version)) + (sha256 + (base32 + "0qa0yapkypywhzx8ai1p27125h9v1qy89f7v3w1kjz1jfwgl73jq")))))) + (define-public icu4c-build-root (package (inherit icu4c) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index ecc839fde3..097207a089 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -72,6 +72,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages lsof) #:use-module (gnu packages networking) + #:use-module (gnu packages markup) #:use-module (gnu packages maths) #:use-module (gnu packages messaging) #:use-module (gnu packages multiprecision) @@ -271,6 +272,7 @@ Breeze is the default theme for the KDE Plasma desktop.") (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:test-exclude "flatpaktest" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-qmlmodule-required @@ -282,13 +284,12 @@ Breeze is the default theme for the KDE Plasma desktop.") (lambda _ (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output "/lib/plasma-discover")))) - (replace 'check + (add-before 'check 'check-setup (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "XDG_DATA_DIRS" (string-append (getcwd) - ":" (getenv "XDG_DATA_DIRS"))) - (invoke "ctest" "-E" "knsbackendtest"))))))) + ":" (getenv "XDG_DATA_DIRS"))))))))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list appstream-qt6 attica @@ -314,14 +315,17 @@ Breeze is the default theme for the KDE Plasma desktop.") kdeclarative kcmutils kidletime + libostree ; required by flatpak + markdown packagekit-qt6 purpose + qcoro-qt6 qt5compat qtdeclarative qtsvg + qtwebview qcoro-qt6)) ;; -- The following features have been disabled: - ;; * Ostree, Library to manage ostree repository. Required to build the rpm-ostree backend ;; * RpmOstree, rpm-ostree binary to manage the system. Required to build the rpm-ostree backend ;; ;; -- The following OPTIONAL packages have not been found: diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 8e2db6861f..1a5881e912 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -893,7 +893,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (define-public libreoffice (package (name "libreoffice") - (version "25.2.3.2") ;keep in sync with hunspell dictionaries + (version "25.2.5.2") ;keep in sync with hunspell dictionaries (source (origin (method url-fetch) @@ -906,7 +906,7 @@ commonly called @code{ftoa} or @code{dtoa}.") "https://downloadarchive.documentfoundation.org/libreoffice/old/" version "/src/libreoffice-" version ".tar.xz"))) (sha256 - (base32 "1pysqa31by4rhghnfyz8xbygqn6d6fjqm2py1apxkw3xa8g4cm7a")))) + (base32 "0fdkn9lf2q5d7kminsbcn1g2ih2ilaw2jnyarsns4jczch4v57wc")))) (build-system glib-or-gtk-build-system) (arguments (list diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8dc546ad69..9668e078a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4258,7 +4258,10 @@ that the Ethernet protocol is much simpler than the IP protocol.") (string-append "HDRDIR=" out "/include") (string-append "SBINDIR=" out "/sbin") (string-append "CONFDIR=" out "/etc") - (string-append "MANDIR=" out "/share/man"))) + (string-append "MANDIR=" out "/share/man") + #$@(if (target-ppc64le?) + '("CCOPTS=-O2 -pipe -Wno-incompatible-pointer-types") + '()))) #:phases #~(modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index ff43859814..e6d456c8f6 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -357,25 +357,6 @@ library.") (modify-inputs (package-propagated-inputs spdlog-1.15) (replace "fmt" fmt-9))))) -(define-public spdlog-1.10 - (package - (inherit spdlog-1.15) - (version "1.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gabime/spdlog") - (commit (string-append "v" version)))) - (file-name (git-file-name "spdlog" version)) - (sha256 - (base32 "02xz017ba9fssm1rp1fcfld7h79awbr6fqai9dxaqp02akp3davk")) - (modules '((guix build utils))) - (snippet #~(delete-file-recursively "include/spdlog/fmt/bundled")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs spdlog-1.15) - (replace "fmt" fmt-8))))) - ;; Update when changing the pinned version of fmt. (define-public spdlog spdlog-1.13) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 4744f39579..8bf5cb7459 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.80.4") + (version "2.80.10") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1sbfrzsjakfkbjvw8hl344l0cnf65nia8b7xxb6y7370k47mkil1")) + (base32 "1m4qm5ymjb2579kwsz9hzclpvh7im3f2vz5fg7828r2ap1dlfwlr")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index cd320dcf81..b65ac28b06 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -46,7 +46,7 @@ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/llvm-project.git") + (url "https://github.com/ROCm/llvm-project/") (commit (string-append "rocm-" %rocm-version)))) (file-name (git-file-name "llvm-for-rocm" %rocm-version)) (sha256 @@ -60,7 +60,7 @@ (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/RadeonOpenCompute/rocm-cmake.git") + (url "https://github.com/ROCm/rocm-cmake/") (commit (string-append "rocm-" version)))) (file-name (git-file-name name version)) (sha256 @@ -69,7 +69,7 @@ (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Tests try to use git commit (native-inputs (list git)) - (home-page "https://github.com/ROCm/rocm-cmake") + (home-page "https://rocm.docs.amd.com/projects/ROCmCMakeBuildTools/") (synopsis "ROCm cmake modules") (description "ROCm cmake modules provides cmake modules for common build tasks needed for the ROCM software stack.") @@ -82,17 +82,19 @@ tasks needed for the ROCM software stack.") (source %rocm-llvm-origin) (build-system cmake-build-system) (arguments - `(#:build-type "Release" - #:configure-flags - (list "-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "amd/device-libs")))))) + (list + #:tests? #f ; Not sure how to run them. + #:build-type "Release" + #:configure-flags + #~(list "-DCMAKE_SKIP_BUILD_RPATH=FALSE" + "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "amd/device-libs")))))) (inputs (list llvm-for-rocm)) - (home-page "https://github.com/ROCm/ROCm-Device-Libs") + (home-page "https://github.com/ROCm/llvm-project/") (synopsis "ROCm Device libraries") (description "AMD-specific device-side language runtime libraries, namely oclc, ocml, ockl, opencl, hip and hc.") |