summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/bioinformatics.scm144
-rw-r--r--gnu/packages/build-tools.scm10
-rw-r--r--gnu/packages/cpp.scm41
-rw-r--r--gnu/packages/cran.scm4
-rw-r--r--gnu/packages/databases.scm267
-rw-r--r--gnu/packages/dbm.scm6
-rw-r--r--gnu/packages/diffoscope.scm5
-rw-r--r--gnu/packages/gcc.scm39
-rw-r--r--gnu/packages/gnuzilla.scm6
-rw-r--r--gnu/packages/golang.scm21
-rw-r--r--gnu/packages/haskell-apps.scm24
-rw-r--r--gnu/packages/haskell-xyz.scm6
-rw-r--r--gnu/packages/icu4c.scm14
-rw-r--r--gnu/packages/kde-plasma.scm18
-rw-r--r--gnu/packages/libreoffice.scm4
-rw-r--r--gnu/packages/linux.scm5
-rw-r--r--gnu/packages/logging.scm19
-rw-r--r--gnu/packages/machine-learning.scm251
-rw-r--r--gnu/packages/prolog.scm4
-rw-r--r--gnu/packages/protobuf.scm11
-rw-r--r--gnu/packages/rocm.scm28
-rw-r--r--gnu/packages/rpc.scm88
-rw-r--r--gnu/packages/tbb.scm14
-rw-r--r--gnu/services/linux.scm2
-rw-r--r--guix/cpu.scm55
-rw-r--r--guix/lint.scm6
-rw-r--r--guix/transformations.scm15
27 files changed, 298 insertions, 809 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4ca7998cc7..8dffc86c00 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
@@ -20392,141 +20397,6 @@ includes operations like compartment, insulation or peak calling.")
the HiCExplorer and pyGenomeTracks packages.")
(license license:gpl3+)))
-(define-public python-hicexplorer
- (package
- (name "python-hicexplorer")
- (version "3.7.4")
- (source
- (origin
- ;; The latest version is not available on Pypi.
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/deeptools/HiCExplorer")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1cjr9l0vcngd0f4dmar388ri1ah1bqybnn53jc85xwh07wfacq7l"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags
- '(list "hicexplorer/test/general/"
- "--ignore" "hicexplorer/test/general/test_hicTADClassifier.py"
- "--ignore" "hicexplorer/test/general/test_hicTrainTADClassifier.py"
- "-k"
- (string-append
- ;; Unknown chromosome: ChrX
- "not test_build_matrix_restrictionCutFile_two"
- ;; fixture 'keepSelfLigation' not found
- " and not test_build_matrix_restrictionCutFile_six"
- ;; ValueError: object dtype is not supported by sparse matrices
- " and not test_hic_transfer_obs_exp_perChromosome"
-
- ;; No KR balancing available
- " and not test_correct_matrix_KR_partial_cool"
- " and not test_correct_matrix_KR_cool"
- " and not test_correct_matrix_KR_H5"))
- #:phases
- #~(modify-phases %standard-phases
- ;; See https://github.com/deeptools/Knight-Ruiz-Matrix-balancing-algorithm/issues/23
- (add-after 'unpack 'remove-dependency-on-krbalancing
- (lambda _
- (substitute* "hicexplorer/hicCorrectMatrix.py"
- (("from krbalancing import.*") "")
- (("( *)assert\\(args.correctionMethod == 'KR'\\)" m indent)
- (string-append m "\n"
- indent "log.error('krbalancing not available')\n"
- indent "exit(1)")))
- (substitute* "setup.py"
- (("\"krbalancing >= 0.0.5\",") ""))
- (substitute* "requirements.txt"
- (("krbalancing >= 0.0.5") ""))))
- (add-after 'unpack 'fix-references
- (lambda _
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages")))
- (substitute* "hicexplorer/lib/tadClassifier.py"
- (("model_location = site.getsitepackages\\(\\)\\[0\\]")
- (string-append "model_location = \"" site "\""))))
- (substitute* "hicexplorer/hicFindRestSite.py"
- (("subprocess.check_output\\(\\[\"cat\"")
- (string-append "subprocess.check_output([\""
- (which "cat") "\""))
- (("cmd = 'sort -k1")
- (string-append "cmd = '" (which "sort") " -k1")))))
- ;; The tests aim to detect available memory and run more tests when
- ;; there is more available memory. Let's run them deterministically
- ;; instead and don't run any tests that require more than 1GB of
- ;; RAM.
- (add-after 'unpack 'run-only-low-mem-tests
- (lambda _
- (with-directory-excursion "hicexplorer/test"
- (substitute* '("trivial_runs/test_hicBuildMatrix_trivial_runs_2.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_five.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_four.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_two_1.py"
- "trivial_runs/test_hicBuildMatrix_trivial_runs.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_two_3.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_three.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_two.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_two_2.py"
- "trivial_runs/test_hicAggregateContacts_trivial_runs_six.py"
- "general/test_hicDifferentialTAD.py"
- "general/test_hicDetectLoops.py"
- "general/test_hicPlotMatrix.py"
- "general/test_hicHyperoptDetectLoops.py"
- "general/test_hicCreateThresholdFile.py"
- "general/test_hicMergeDomains.py"
- "general/test_hicHyperoptDetectLoopsHiCCUPS.py"
- "general/test_hicAggregateContacts.py"
- "general/test_hicInterIntraTAD.py")
- (("^memory =.*") "memory = 1\n"))))))))
- (propagated-inputs
- (list python-biopython
- python-cleanlab
- python-cooler
- python-fit-nbinom
- python-future
- python-graphviz
- python-hic2cool
- python-hicmatrix
- python-hyperopt
- python-imbalanced-learn
- python-intervaltree
- python-ipykernel
- python-jinja2
- python-matplotlib
- python-numpy
- python-pandas
- python-psutil
- python-pybedtools
- python-pybigwig
- python-pygenometracks
- python-pysam
- python-scikit-learn
- python-scipy
- python-tables
- python-tqdm
- python-unidecode))
- (native-inputs
- (list graphviz)) ;for hicexplorer/test/test_compute_function.py
- (home-page "https://hicexplorer.readthedocs.io")
- (synopsis "Process, analyze and visualize Hi-C data")
- (description
- "HiCExplorer is a powerful and easy to use set of tools to process,
-normalize and visualize Hi-C data. HiCExplorer facilitates the creation of
-contact matrices, correction of contacts, TAD detection, A/B compartments,
-merging, reordering or chromosomes, conversion from different formats
-including cooler and detection of long-range contacts. Moreover, it allows
-the visualization of multiple contact matrices along with other types of data
-like genes, compartments, ChIP-seq coverage tracks (and in general any type of
-genomic scores), long range contacts and the visualization of viewpoints.")
- (license license:gpl3)))
-
(define-public python-pygenometracks
(package
(name "python-pygenometracks")
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..aac96f96a7 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2096,29 +2096,6 @@ augment the C++ standard library. The Abseil library code is collected from
Google's C++ code base.")
(license license:asl2.0)))
-;; This is for grpc-for-python-grpcio; keep this in sync with its actual
-;; requirements.
-(define-public abseil-cpp-20211102.0
- (let ((base abseil-cpp-20200923.3))
- (package
- (inherit base)
- (name "abseil-cpp")
- (version "20211102.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/abseil/abseil-cpp")
- (commit "215105818dfde3174fe799600bb0f3cae233d0bf")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "028vlxpmh65kb7s0cpba38qcwk1abyn5br0ffhvvjjh97vld69di"))))
- (arguments
- (substitute-keyword-arguments (package-arguments base)
- ((#:tests? _ #false) #false)
- ((#:configure-flags flags)
- #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags)))))))
-
(define-public abseil-cpp-20220623
(let ((base abseil-cpp-20200923.3))
(package
@@ -2202,6 +2179,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 +2248,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/cran.scm b/gnu/packages/cran.scm
index 48adf3aaac..64b7d820b4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -37779,14 +37779,14 @@ colored by the number of neighboring points. This is useful to visualize the
(define-public r-arrow
(package
(name "r-arrow")
- (version "20.0.0.2")
+ (version "21.0.0")
(source
(origin
(method url-fetch)
(uri (cran-uri "arrow" version))
(sha256
(base32
- "19xnz3df1r9n01dbsf05xkw6q5w8vipzkkb5bpx7jlcp38jnp8zn"))))
+ "1ipwcgzbzr5xb1ff0ikwxdfhbniqdjmvi4505cmb0divg9p50946"))))
(properties
`((upstream-name . "arrow")
(updater-ignored-native-inputs . ("r-duckdb"))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 2bfa37ea90..f262aaf95b 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))
@@ -1316,17 +1310,16 @@ as a drop-in replacement of MySQL.")
(define-public mariadb-connector-c
(package
(name "mariadb-connector-c")
- (version "3.1.13")
+ (version "3.4.5")
(source
(origin
(method url-fetch)
(uri (string-append
- "https://downloads.mariadb.org/f/connector-c-" version
- "/mariadb-connector-c-" version "-src.tar.gz"
- "/from/https%3A//mirrors.ukfast.co.uk/sites/mariadb/?serve"))
+ "https://downloads.mariadb.org/rest-api/connector-c/"
+ version "/mariadb-connector-c-" version "-src.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0xb8fiissblxb319y5ifqqp86zblwis789ipb753pcb4zpnsaw82"))))
+ (base32 "18y1x985pnvvirmwfka81ygsvl7isc52mj9c9hvc69fb2qw1jzmi"))))
(inputs
(list openssl))
(build-system cmake-build-system)
@@ -1996,7 +1989,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 +1998,7 @@ including field and record folding.")
(file-name (git-file-name name version))
(sha256
(base32
- "0mylma106w93kxhj89g9y1ccdq7m9m94wrmv5nyr17yc1zsk87sg"))
+ "1cgr33qv639fyx067sg8nsy8mnfac9xgmmw2qwi2bcmir777ma4q"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -5171,7 +5164,7 @@ with integrated support for finding required rows quickly.")
(define-public apache-arrow
(package
(name "apache-arrow")
- (version "20.0.0")
+ (version "21.0.0")
(source
(origin
(method git-fetch)
@@ -5181,7 +5174,7 @@ with integrated support for finding required rows quickly.")
(file-name (git-file-name name version))
(sha256
(base32
- "1n96m8fbpg8azbwm6hx3adbc2sa070k1zh0lj18yqlw2nqmdslr4"))))
+ "0lxywrjfwhiznsldpv5bd6g357za5ng64jvy943kp0ndckh5l4g9"))))
(build-system cmake-build-system)
(arguments
(list
@@ -5425,132 +5418,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 +5486,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/gcc.scm b/gnu/packages/gcc.scm
index e0231f88fe..aa1454ca96 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -675,11 +675,32 @@ Go. It also includes runtime support libraries for these languages.")
(define %gcc-13-x86_64-micro-architectures
(append %gcc-12-x86_64-micro-architectures
- '("graniterapids"))) ;Intel
+ '("graniterapids" ;Intel
+ "lujiazui")))
+
+(define %gcc-14-aarch64-micro-architectures
+ (append %gcc-13-aarch64-micro-architectures
+ '("armv9.4-a")))
+
+(define %gcc-14-ppc64le-micro-architectures
+ (append %gcc-10-ppc64le-micro-architectures
+ '("power11")))
(define %gcc-14-x86_64-micro-architectures
(append %gcc-13-x86_64-micro-architectures
- '("znver5"))) ;AMD
+ '("znver5" ;AMD
+ "yongfeng")))
+
+(define %gcc-15-aarch64-micro-architectures
+ (append %gcc-14-aarch64-micro-architectures
+ '("armv9.5-a")))
+
+(define %gcc-15-x86_64-micro-architectures
+ (append
+ (fold delete %gcc-14-x86_64-micro-architectures
+ '("knm" "knl"))
+ '("diamondrapids" ;Intel
+ "shijidadao")))
(define-public gcc-7
(package
@@ -887,10 +908,10 @@ It also includes runtime support libraries for these languages.")
(("\\.\\./lib64") "../lib"))))))))
(properties
`((compiler-cpu-architectures
- ("aarch64" ,@%gcc-13-aarch64-micro-architectures)
+ ("aarch64" ,@%gcc-14-aarch64-micro-architectures)
("armhf" ,@%gcc-13-armhf-micro-architectures)
- ("i686" ,@%gcc-13-x86_64-micro-architectures)
- ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
+ ("i686" ,@%gcc-14-x86_64-micro-architectures)
+ ("powerpc64le" ,@%gcc-14-ppc64le-micro-architectures)
("x86_64" ,@%gcc-14-x86_64-micro-architectures))
,@(package-properties gcc-11)))))
@@ -932,11 +953,11 @@ It also includes runtime support libraries for these languages.")
(string-append lib "/include"))))))))))))
(properties
`((compiler-cpu-architectures
- ("aarch64" ,@%gcc-13-aarch64-micro-architectures)
+ ("aarch64" ,@%gcc-15-aarch64-micro-architectures)
("armhf" ,@%gcc-13-armhf-micro-architectures)
- ("i686" ,@%gcc-13-x86_64-micro-architectures)
- ("powerpc64le" ,@%gcc-10-ppc64le-micro-architectures)
- ("x86_64" ,@%gcc-14-x86_64-micro-architectures))
+ ("i686" ,@%gcc-15-x86_64-micro-architectures)
+ ("powerpc64le" ,@%gcc-14-ppc64le-micro-architectures)
+ ("x86_64" ,@%gcc-15-x86_64-micro-architectures))
,@(package-properties gcc-11)))))
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 7e5ebef0e9..13de000920 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014-2025 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
-;;; Copyright © 2016-2019, 2021, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2019, 2021, 2024, 2025 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017, 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
@@ -931,8 +931,8 @@ variable defined below. It requires guile-json to be installed."
rust
`(,rust "cargo")
rust-cbindgen
- llvm-17
- clang-17
+ llvm-20
+ clang-20
perl
node-lts
python-wrapper
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3f79d9862e..eb04e2eb86 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016-2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016-2025 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2016, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
@@ -1012,6 +1012,17 @@ in the style of communicating sequential processes (@dfn{CSP}).")
;; as the bootstrap toolchain.
(alist-replace "go" (list go-1.21) (package-native-inputs go-1.21)))))
+(define %go-1.23-arm64-micro-architectures
+ ;; https://go.dev/wiki/MinimumRequirements#arm64
+ ;; Allowed values are v8.{0-9} and v9.{0-5}. This may be followed by an option
+ ;; specifying extensions implemented by target hardware. Valid options are
+ ;; ,lse and ,crypto.
+ ;; Match Guix's specifications and then rewrite in (guix transformations).
+ (append (map (lambda (suffix) (string-append "armv8" suffix "-a"))
+ '("" ".1" ".2" ".3" ".4" ".5" ".6" ".7" ".8" ".9"))
+ (map (lambda (suffix) (string-append "armv9" suffix "-a"))
+ '("" ".1" ".2" ".3" ".4" ".5"))))
+
(define-public go-1.23
(package
(inherit go-1.22)
@@ -1025,7 +1036,13 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(commit (string-append "go" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "06c5cjjqk95p16cb6p8fgqqsddc1a1kj3w2m0na5v91gvwxbd0pq"))))))
+ (base32 "06c5cjjqk95p16cb6p8fgqqsddc1a1kj3w2m0na5v91gvwxbd0pq"))))
+ (properties
+ `((compiler-cpu-architectures
+ ("aarch64" ,@%go-1.23-arm64-micro-architectures)
+ ("armhf" ,@%go-1.17-arm-micro-architectures)
+ ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)
+ ("x86_64" ,@%go-1.18-x86_64-micro-architectures))))))
(define-public go-1.24
(package
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index e626509067..5a1f654652 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -888,32 +888,20 @@ is programmed in Haskell.")
(define-public scroll
(package
(name "scroll")
- (version "1.20180421")
+ (version "1.20250228.2")
(source
(origin
(method url-fetch)
(uri (hackage-uri "scroll" version))
(sha256
(base32
- "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj"))))
+ "1p1741zqsxg017d08ym1clzqcdlai487wb6q12m1q7dr6i8c0gfj"))))
(build-system haskell-build-system)
- (properties '((upstream-name . "scroll")))
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (add-after 'install 'touch-static-output
- (lambda* (#:key outputs #:allow-other-keys)
- ;; The Haskell build system adds a "static" output by
- ;; default, and there is no way to override this until
- ;; <https://issues.guix.gnu.org/41569> is fixed. Without
- ;; this phase, the daemon complains because we do not
- ;; create the "static" output.
- (with-output-to-file (assoc-ref outputs "static")
- (lambda ()
- (display "static output not used\n")))
- #t)))))
+ (properties '((upstream-name . "scroll")
+ (updater-extra-inputs "ghc-base-compat")))
(inputs
- (list ghc-case-insensitive
+ (list ghc-base-compat
+ ghc-case-insensitive
ghc-data-default
ghc-ifelse
ghc-monad-loops
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 6b8cce3cfc..fd7519b957 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2015, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
-;;; Copyright © 2016, 2019, 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2019, 2023, 2025 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
@@ -7901,7 +7901,9 @@ between 2 and 3 times faster than the Mersenne Twister.")
"lib/UI/NCurses/Enums.chs"
"lib/UI/NCurses/Panel.chs")
(("<ncursesw/") "<"))
- #t)))
+ ;; KEY_EVENT doesn't appear in our ncurses.h
+ (substitute* "lib/UI/NCurses/Enums.chs"
+ ((".*KEY_EVENT.*") "")))))
#:cabal-revision
("1"
"1wfdy716s5p1sqp2gsg43x8wch2dxg0vmbbndlb2h3d8c9jzxnca")))
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 d1926c3426..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:
@@ -1955,7 +1959,8 @@ on QtMultimedia and @command{yt-dlp}.")
kstatusnotifieritem
qtdeclarative))
(propagated-inputs (list plasma-workspace))
- (arguments (list #:qtbase qtbase))
+ (arguments (list #:tests? #f ; no tests
+ #:qtbase qtbase))
(home-page "https://invent.kde.org/plasma/plasma-browser-integration")
(synopsis "Integrate browsers into the Plasma Desktop")
(description
@@ -3125,7 +3130,8 @@ of a Plasma shell.")
plasma-workspace
qtdeclarative
qtwebengine))
- (arguments (list #:qtbase qtbase))
+ (arguments (list #:qtbase qtbase
+ #:tests? #f)) ; no tests
(synopsis "Control center to configure Plasma Desktop")
(description "This package provides configuration UI for Plasma Desktop.")
(home-page "https://invent.kde.org/plasma/systemsettings")
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/machine-learning.scm b/gnu/packages/machine-learning.scm
index 061cb934a4..2b6955b406 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -2289,50 +2289,6 @@ number of threads used in the threadpool-backed of common native libraries used
for scientific computing and data science (e.g. BLAS and OpenMP).")
(license license:bsd-3)))
-(define-public python-imbalanced-learn
- (package
- (name "python-imbalanced-learn")
- (version "0.12.2")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "imbalanced-learn" version))
- (sha256
- (base32 "1hgncab4g4xry7yl6wwsj1wmfnxbsajx6qmycvr28wdhvk75c358"))))
- (build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags '(list "-k"
- ;; Although we cannot satify the Tensorflow and Keras requirements
- ;; (python-keras >= 2.4.3 and tensorflow >= 2.4.3), all tests
- ;; besides these pass.
- "not balanced_batch_generator and not BalancedBatchGenerator")
- #:phases '(modify-phases %standard-phases
- (add-after 'unpack 'unbreak-tests
- (lambda _
- ;; Some tests require a home directory
- (setenv "HOME"
- (getcwd)))))))
- (propagated-inputs (list python-joblib python-numpy python-scikit-learn
- python-scipy python-threadpoolctl))
- (native-inputs (list python-black
- python-flake8
- python-keras
- python-mypy
- python-pandas
- python-pytest
- python-pytest-cov
- python-setuptools
- python-wheel
- tensorflow))
- (home-page "https://github.com/scikit-learn-contrib/imbalanced-learn")
- (synopsis "Toolbox for imbalanced dataset in machine learning")
- (description
- "This is a Python package offering a number of re-sampling
-techniques commonly used in datasets showing strong between-class imbalance.
-It is compatible with @code{scikit-learn}.")
- (license license:expat)))
-
(define-public python-hdbscan
(package
(name "python-hdbscan")
@@ -4148,213 +4104,6 @@ any function). It currently contains the interface and IO code from the Shap
project, and it will potentially also do the same for the Lime project.")
(license license:expat)))
-(define-public python-keras-applications
- (package
- (name "python-keras-applications")
- (version "1.0.8")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "Keras_Applications" version))
- (sha256
- (base32
- "1rcz31ca4axa6kzhjx4lwqxbg4wvlljkj8qj9a7p9sfd5fhzjyam"))))
- (build-system python-build-system)
- ;; The tests require Keras, but this package is needed to build Keras.
- (arguments '(#:tests? #f))
- (propagated-inputs
- (list python-h5py python-numpy))
- (native-inputs
- (list python-pytest python-pytest-cov
- python-pytest-xdist))
- (home-page "https://github.com/keras-team/keras-applications")
- (synopsis "Reference implementations of popular deep learning models")
- (description
- "This package provides reference implementations of popular deep learning
-models for use with the Keras deep learning framework.")
- (license license:expat)))
-
-(define-public python-keras-preprocessing
- (package
- (name "python-keras-preprocessing")
- (version "1.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "Keras_Preprocessing" version))
- (sha256
- (base32
- "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-numpy python-six))
- (native-inputs
- (list python-pandas
- python-pillow
- python-pytest
- python-pytest-cov
- python-pytest-xdist
- tensorflow))
- (home-page "https://github.com/keras-team/keras-preprocessing/")
- (synopsis "Data preprocessing and augmentation for deep learning models")
- (description
- "Keras Preprocessing is the data preprocessing and data augmentation
-module of the Keras deep learning library. It provides utilities for working
-with image data, text data, and sequence data.")
- (license license:expat)))
-
-(define-public python-keras
- (package
- (name "python-keras")
- (version "2.3.1")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "Keras" version))
- (sha256
- (base32
- "1k68xd8n2y9ldijggjc8nn4d6d1axw0p98gfb0fmm8h641vl679j"))
- (modules '((guix build utils)))
- (snippet
- '(substitute* '("keras/callbacks/callbacks.py"
- "keras/engine/training_utils.py"
- "keras/engine/training.py"
- "keras/engine/training_generator.py"
- "keras/utils/generic_utils.py")
- (("from collections import Iterable")
- "from collections.abc import Iterable")
- (("collections.Container")
- "collections.abc.Container")
- (("collections.Mapping")
- "collections.abc.Mapping")
- (("collections.Sequence")
- "collections.abc.Sequence")))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'tf-compatibility
- (lambda _
- (substitute* "keras/backend/tensorflow_backend.py"
- (("^get_graph = .*")
- "get_graph = tf.get_default_graph")
- (("tf.compat.v1.nn.fused_batch_norm")
- "tf.nn.fused_batch_norm")
- ;; categorical_crossentropy does not support axis
- (("from_logits=from_logits, axis=axis")
- "from_logits=from_logits")
- ;; dropout accepts a level number, not a named rate argument.
- (("dropout\\(x, rate=level,")
- "dropout(x, level,")
- (("return x.shape.rank")
- "return len(x.shape)"))))
- (add-after 'unpack 'hdf5-compatibility
- (lambda _
- ;; The truth value of an array with more than one element is ambiguous.
- (substitute* "tests/keras/utils/io_utils_test.py"
- ((" *assert .* == \\[b'(asd|efg).*") ""))
- (substitute* "tests/test_model_saving.py"
- (("h5py.File\\('does not matter',")
- "h5py.File('does not matter', 'w',"))
- (substitute* "keras/utils/io_utils.py"
- (("h5py.File\\('in-memory-h5py', driver='core', backing_store=False\\)")
- "h5py.File('in-memory-h5py', 'w', driver='core', backing_store=False)")
- (("h5file.fid.get_file_image")
- "h5file.id.get_file_image"))
- (substitute* "keras/engine/saving.py"
- (("\\.decode\\('utf-?8'\\)") ""))))
- (add-after 'unpack 'delete-unavailable-backends
- (lambda _
- (delete-file "keras/backend/theano_backend.py")
- (delete-file "keras/backend/cntk_backend.py")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; These tests attempt to download data files from the internet.
- (delete-file "tests/integration_tests/test_datasets.py")
- (delete-file "tests/integration_tests/imagenet_utils_test.py")
- (invoke "python" "-m" "pytest" "tests"
- "-p" "no:pep8"
- ;; FIXME: python-build-system lacks PARALLEL-TESTS?
- "-n" (number->string (parallel-job-count))
- ;; This one uses the theano backend that we don't have.
- "--ignore=tests/test_api.py"
- "--ignore=tests/keras/backend/backend_test.py"
- ;; Our Tensorflow version does not have the coder ops library.
- "--ignore=tests/keras/callbacks/callbacks_test.py"
- ;; ...nor do we have tensorboard
- "--ignore=tests/keras/callbacks/tensorboard_test.py"
- "-k"
- (string-append
- ;; See https://github.com/keras-team/keras/pull/7033
- "not test_TimeDistributed_learning_phase "
- ;; XXX fails because no closure is provided
- "and not test_func_dump_and_load_backwards_compat "
- ;; XXX real bug? These are all tests that fail due to
- ;; shape mismatch, e.g. "got logits shape [12,3] and
- ;; labels shape [9]"
- "and not test_model_with_crossentropy_losses_channels_first "
- "and not test_masking_correctness_output_size_not_equal_to_first_state_size "
- "and not test_convolutional_recurrent "
- "and not test_axis "
-
- ;; XXX fails because of 3/15 values have unexpected differences.
- "and not test_masking_correctness_output_not_equal_to_first_state "
- ;; XXX fails because of a difference of about 0.1
- "and not test_sample_weighted "
- ;; XXX fails because of a difference of about 0.3
- "and not test_scalar_weighted "
- ;; XXX fails because of a difference of about 0.2
- "and not test_unweighted "
-
- ;; XXX I cannot reproduce this in an interactive
- ;; Python session, because l2_norm works just fine.
- "and not test_weighted " ;TestCosineSimilarity
- "and not test_config " ;TestCosineSimilarity
-
- ;; The following test fails only in the build
- ;; container; skip it.
- "and not test_selu "
- ;; The following test was found flaky and removed in
- ;; recent versions.
- "and not test_stateful_metrics"))))))))
- (propagated-inputs
- (list python-h5py
- python-keras-applications
- python-keras-preprocessing
- python-numpy
- python-pydot
- python-pyyaml
- python-scipy
- python-six
- tensorflow
- graphviz))
- (native-inputs
- (list python-flaky
- python-markdown
- python-pandas
- python-pytest
- python-pytest-cov
- python-pytest-timeout
- python-pytest-xdist
- python-pyux
- python-sphinx
- python-requests))
- (home-page "https://keras.io/")
- (synopsis "High-level deep learning framework")
- (description "Keras is a high-level neural networks API, written in Python
-and capable of running on top of TensorFlow. It was developed with a focus on
-enabling fast experimentation. Use Keras if you need a deep learning library
-that:
-@itemize
-@item Allows for easy and fast prototyping (through user friendliness,
- modularity, and extensibility).
-@item Supports both convolutional networks and recurrent networks, as well as
- combinations of the two.
-@item Runs seamlessly on CPU and GPU.
-@end itemize\n")
- (license license:expat)))
-
(define-public gloo
(let ((version "0.0.0") ; no proper version tag
(commit "81925d1c674c34f0dc34dd9a0f2151c1b6f701eb")
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/protobuf.scm b/gnu/packages/protobuf.scm
index 6ac17d3733..765836cf65 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -465,6 +465,17 @@ from protobuf specification files.")
mechanism for serializing structured data.")
(license license:bsd-3)))
+(define-public python-protobuf-4
+ (package/inherit python-protobuf-5
+ (name "python-protobuf")
+ (version "4.21.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "protobuf" version))
+ (sha256
+ (base32 "1pabwidv12r73fy0jlslpgi60zd1lbx9rjnb23kgdm8wcsjl043b"))))))
+
(define-public python-protobuf
(package
(name "python-protobuf")
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.")
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index c083074cc7..36c937dcef 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -49,10 +49,21 @@
#:use-module (gnu packages tls)
#:use-module (srfi srfi-1))
+;; XXX: Starting from version 1.47.5, opencensus-proto is required.
+;; The package is already deprecated upstream, so it's probably not
+;; worth it spending time packaging it in Guix, just inject the source
+;; instead, to also avoid us a recursive git fetch.
+(define opencensus-proto-for-grpc-source
+ (origin
+ (method url-fetch)
+ (uri "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz")
+ (sha256
+ (base32 "1c3jfl1zgjhhqyqii1wils2k05akkvrw50xmf0q0rs2r885kzqdp"))))
+
(define-public grpc
(package
(name "grpc")
- (version "1.34.0")
+ (version "1.52.2")
(outputs '("out" "static"))
(source (origin
(method git-fetch)
@@ -62,7 +73,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "1fs407hnlnm0b8sncjwys9rc7ia5nb7wxrpx39nq3pzzfs1lv3vq"))))
+ "09165p6rh5xvcnnwnmy22lwdfchgjg39y02rwj6zg4rzfps8cb43"))))
(build-system cmake-build-system)
(arguments
(list
@@ -80,6 +91,11 @@
"-DCMAKE_VERBOSE_MAKEFILE=ON")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'unpack-third-party
+ (lambda _
+ (mkdir-p "third_party/opencensus-proto/src")
+ (invoke "tar" "xvf" #+opencensus-proto-for-grpc-source
+ "-C" "third_party/opencensus-proto/src")))
(add-before 'configure 'configure-shared
(lambda* (#:key configure-flags #:allow-other-keys)
(mkdir "../build-shared")
@@ -125,24 +141,6 @@ mile of distributed computing to connect devices, mobile applications and
browsers to backend services.")
(license license:asl2.0)))
-(define-public grpc-for-python-grpcio
- (package
- (inherit grpc)
- (name "grpc")
- (version "1.47.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/grpc/grpc")
- (commit (string-append "v" version))
- (recursive? #true)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1nl2d92f3576m69991d7gwyk1giavm04fagr612yjh90rni01ikw"))))
- (inputs
- (list abseil-cpp-20211102.0 c-ares/cmake openssl re2 zlib))))
-
;; Some packages require this older version.
(define-public grpc-1.16.1
(package
@@ -200,14 +198,13 @@ type information of gRPC.")
(define-public python-grpcio
(package
(name "python-grpcio")
- (version "1.47.0")
+ (version "1.52.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "grpcio" version))
(sha256
- (base32
- "00gqhz0b1sqnfx6zy7h5z41b6mpsq57r1f3p95xradcvmdgskfsx"))
+ (base32 "1nsgm8q4yahzdab4m3irffdw9zklq4kb7f8hki1ayfgw54ysim55"))
(modules '((guix build utils) (ice-9 ftw)))
(snippet
'(begin
@@ -252,7 +249,7 @@ type information of gRPC.")
(substitute* '("setup.py" "src/python/grpcio/commands.py")
(("'cc'") "'gcc'")))))))
(inputs
- (list abseil-cpp-20211102.0 c-ares grpc-for-python-grpcio openssl re2 zlib))
+ (list abseil-cpp-cxxstd11 c-ares grpc openssl re2 zlib))
(native-inputs
(list python-cython python-setuptools python-wheel))
(propagated-inputs
@@ -266,29 +263,32 @@ with the HTTP/2-based RPC framework gRPC.")
(define-public python-grpcio-tools
(package
(name "python-grpcio-tools")
- (version "1.47.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "grpcio-tools" version))
- (modules '((guix build utils)))
- (snippet
- ;; This file is auto-generated.
- '(delete-file "grpc_tools/_protoc_compiler.cpp"))
- (sha256
- (base32
- "0g3xwv55lvf5w64zb44dipwqz7729cbqc7rib77ddqab91w56jzn"))))
- (build-system python-build-system)
+ (version "1.52.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "grpcio-tools" version))
+ (modules '((guix build utils)))
+ (snippet
+ ;; This file is auto-generated.
+ '(delete-file "grpc_tools/_protoc_compiler.cpp"))
+ (sha256
+ (base32 "0m5xwhz3l0n3b1bzjncynwflnc5iyv4xrjq046ppcck4rpj9fgn0"))))
+ (build-system pyproject-build-system)
(arguments
- (list #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'configure
- (lambda _
- (setenv "GRPC_PYTHON_BUILD_WITH_CYTHON" "1"))))))
- (native-inputs (list python-cython))
- (propagated-inputs (list python-grpcio python-protobuf))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'configure
+ (lambda _
+ (setenv "GRPC_PYTHON_BUILD_WITH_CYTHON" "1"))))))
+ (native-inputs (list python-cython python-setuptools python-wheel))
+ (propagated-inputs (list python-grpcio python-protobuf-4))
(home-page "https://grpc.io")
(synopsis "Protobuf code generator for gRPC")
- (description "The gRPC tools for Python provide a special plugin for
-generating server and client code from @file{.proto} service definitions.")
+ (description
+ "The gRPC tools for Python provide a special plugin for generating server
+and client code from @file{.proto} service definitions.")
(license license:asl2.0)))
(define-public apache-thrift
diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index 5fdc41553b..47f8d4a09a 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -40,7 +40,7 @@
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/oneapi-src/oneTBB")
+ (url "https://github.com/uxlfoundation/oneTBB/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
@@ -79,14 +79,14 @@
((".*test_multifunction_node.*") "")
((".*test_async_node.*") ""))))))
(else '())))))
- (home-page "https://www.threadingbuildingblocks.org")
+ (home-page "https://uxlfoundation.github.io/oneTBB/")
(synopsis "C++ library for parallel programming")
(description
- "Threading Building Blocks (TBB) is a C++ runtime library that abstracts
-the low-level threading details necessary for optimal multi-core performance.
-It uses common C++ templates and coding style to eliminate tedious threading
-implementation work. It provides parallel loop constructs, asynchronous
-tasks, synchronization primitives, atomic operations, and more.")
+ "@acronym{TBB, Threading Building Blocks} is a C++ runtime library that
+abstracts the low-level threading details necessary for optimal multi-core
+performance. It uses common C++ templates and coding style to eliminate
+tedious threading implementation work. It provides parallel loop constructs,
+asynchronous tasks, synchronization primitives, atomic operations, and more.")
(license asl2.0)))
(define-public python-tbb
diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm
index 80c35717a9..a0720f7073 100644
--- a/gnu/services/linux.scm
+++ b/gnu/services/linux.scm
@@ -705,6 +705,8 @@ placed in a udev rules file."
(provision (list (string->symbol name)))
;; Make sure the homes are already present
(requirement requirement)
+ (modules `((ice-9 match)
+ ,@%default-modules))
(stop
#~(lambda args
(match (quote #$policy)
diff --git a/guix/cpu.scm b/guix/cpu.scm
index ef5c3dce2a..39766f8e9d 100644
--- a/guix/cpu.scm
+++ b/guix/cpu.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2022-2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022-2025 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -127,8 +127,10 @@ corresponds to CPU, a record as returned by 'current-cpu'."
(if-flags rest ...))))))
(or (and (equal? "GenuineIntel" (cpu-vendor cpu))
- (= 6 (cpu-family cpu)) ;the "Pentium Pro" family
- (if-flags ("avx512f" "amx_complex" => "graniterapids-d")
+ (or (= 6 (cpu-family cpu)) ;the "Pentium Pro" family
+ (= 19 (cpu-family cpu)))
+ (if-flags ("avx512f" "amx_transpose" => "diamondrapids")
+ ("avx512f" "amx_complex" => "graniterapids-d")
("avx512f" "amx_fp16" => "graniterapids")
("avx512f" "avx512vp2intersect" => "tigerlake")
("avx512f" "tsxldtrk" => "sapphirerapids")
@@ -136,9 +138,12 @@ corresponds to CPU, a record as returned by 'current-cpu'."
("avx512f" "wbnoinvd" => "icelake-server")
("avx512f" "avx512bitalg" => "icelake-client")
("avx512f" "avx512vbmi" => "cannonlake")
- ("avx512f" "avx5124vnniw" => "knm")
- ("avx512f" "avx512er" => "knl")
- ("avx512f" => "skylake-avx512")
+ ;; Knights Mill, Knights Landing removed in GCC-15.
+ ;; Fall-through, skipping skylake-avx512.
+ ;; Recommended by GCC is broadwell.
+ ;("avx512f" "avx5124vnniw" => "knm")
+ ;("avx512f" "avx512er" => "knl")
+ ("avx512f" "avx512vl" => "skylake-avx512")
("avx" "prefetchi" => "pantherlake")
("avx" "user_msr" => "clearwaterforest")
("avx" "sm3" => "arrowlake-s")
@@ -195,9 +200,13 @@ corresponds to CPU, a record as returned by 'current-cpu'."
"lujiazui"
(cpu->micro-architecture-level cpu))
(if (and (= 7 (cpu-family cpu))
- (>= #x5b (cpu-model cpu)))
+ (= #x5b (cpu-model cpu)))
"yongfeng"
(cpu->micro-architecture-level cpu))
+ (if (and (= 7 (cpu-family cpu))
+ (>= #x6b (cpu-model cpu)))
+ "shijidadao"
+ (cpu->micro-architecture-level cpu))
;; TODO: Recognize CENTAUR/CYRIX/NSC?
@@ -217,11 +226,11 @@ corresponds to CPU, a record as returned by 'current-cpu'."
"armv8.2-a")
(#xd40
"armv8.4-a")
- (#xd15
+ ((or #xd14 #xd15)
"armv8-r")
((or #xd46 #xd47 #xd4d #xd48 #xd4e #xd49 #xd4f)
"armv9-a")
- ((or #xd80 #xd81)
+ ((or #xd80 #xd82 #xd83 #xd84 #xd85 #xd87 #xd88 #xd89 #xd8e)
"armv9.2-a")))
("0x42"
"armv8.1-a")
@@ -236,9 +245,15 @@ corresponds to CPU, a record as returned by 'current-cpu'."
(#x0b8
"armv8.3-a")))
("0x46"
- "armv8.2-a")
+ (match (cpu-model cpu)
+ (#x001
+ "armv8.2-a")
+ (#x003
+ "armv9.3a")))
("0x48"
"armv8.2-a")
+ ("0x4e"
+ "armv9.2-a")
("0x50"
"armv8-a")
("0x51"
@@ -248,9 +263,19 @@ corresponds to CPU, a record as returned by 'current-cpu'."
(#x516
"armv8.1-a")
(#xC01
- "armv8.4-a")))
+ "armv8.4-a")
+ (#x001
+ "armv8.6-a")))
("0x53"
"armv8-a")
+ ("0x61"
+ (match (cpu-model cpu)
+ ("#x12"
+ "armv8.3-a")
+ ((or #x20 #x21 #x22 #x23 #x24 #x25 #x28 #x29)
+ "armv8.5-a")
+ ((or #x30 #x31 #x32 #x33 #x34 #x35 #x38 #x39 #x48 #x49)
+ "armv8.6-a")))
("0x68"
"armv8-a")
("0x6d"
@@ -310,9 +335,9 @@ CPUs for compilers which don't allow for more focused optimizing."
;; AVX512F+ for x86-64-v4, AVX+ for x86-64-v3.
;; https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex
(match gcc-architecture
- ((or "graniterapids-d" "graniterapids" "tigerlake" "sapphirerapids"
- "cooperlake" "icelake-server" "icelake-client" "cannonlake" "knm"
- "knl" "skylake-avx512"
+ ((or "diamondrapids" "graniterapids-d" "graniterapids" "tigerlake"
+ "sapphirerapids" "cooperlake" "icelake-server" "icelake-client"
+ "cannonlake" "knm" "knl" "skylake-avx512"
"znver5" "znver4")
"x86-64-v4")
((or "pantherlake" "clearwaterforest" "arrowlake-s" "sierraforest"
@@ -323,6 +348,6 @@ CPUs for compilers which don't allow for more focused optimizing."
"nehalem" "bonnell" "core2"
"btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1"
"amdfam10"
- "lujiazui" "yongfeng" "x86-64")
+ "lujiazui" "yongfeng" "shijidadao" "x86-64")
"x86-64")
(_ gcc-architecture)))
diff --git a/guix/lint.scm b/guix/lint.scm
index 2033aa36f1..fd46ea6eea 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -693,7 +693,7 @@ or \"bash-minimal\" is not in its inputs. 'wrap-script' is not supported."
input-names)))
(define (check-procedure-body body)
(match body
- ;; Explicitely setting an interpreter is acceptable.
+ ;; Explicitly setting an interpreter is acceptable.
(('wrap-program _ '#:sh . _) '())
(('wrap-program _ . _)
(list (report-wrap-program-error package 'wrap-program)))
@@ -1520,7 +1520,7 @@ password, provided REF's URI is HTTP or HTTPS."
(filter lint-warning?
(map (cut try store <>) (package-supported-systems package))))
- ;; For backwards compatability, don't rely on store being set
+ ;; For backwards compatibility, don't rely on store being set
(or (and=> store check-with-store)
(with-store store
(check-with-store store))))
@@ -2112,7 +2112,7 @@ them for PACKAGE."
(check check-input-labels))
(lint-checker
(name 'wrapper-inputs)
- (description "Make sure 'wrap-program' can finds its interpreter.")
+ (description "Make sure 'wrap-program' can find its interpreter.")
(check check-wrapper-inputs))
(lint-checker
(name 'license)
diff --git a/guix/transformations.scm b/guix/transformations.scm
index 19a1cba206..198b55ed23 100644
--- a/guix/transformations.scm
+++ b/guix/transformations.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2016-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023 Sarthak Shah <shahsarthakw@gmail.com>
-;;; Copyright © 2023, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023-2025 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
;;; This file is part of GNU Guix.
@@ -500,7 +500,18 @@ actual compiler."
(string=? next (search-next "go")))
(cond
((string-prefix? "arm" psabi)
- (setenv "GOARM" (string-take-right psabi 1)))
+ ;; Parse the psabi to set the correct value
+ (cond ((= 5 (string-length psabi))
+ (setenv "GOARM" (string-take-right psabi 1)))
+ ((string=? "a" (string-take-right psabi 1))
+ (let ((version
+ (string-filter
+ (string->char-set ".v" char-set:digit)
+ psabi)))
+ (setenv "GOARM64"
+ (if (= 2 (string-length version))
+ (string-append version ".0")
+ version))))))
((string-prefix? "powerpc" psabi)
(setenv "GOPPC64" psabi))
((string-prefix? "x86_64" psabi)
generated by cgit v1.2.3 (git 2.50.1) at 2025-08-06 09:38:27 +0000