mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Compare commits
41 commits
ccda97f9e2
...
19cd5a7a71
Author | SHA1 | Date | |
---|---|---|---|
|
19cd5a7a71 | ||
|
c03d2f3438 | ||
|
47ebec0a48 | ||
|
818aa007dd | ||
|
d0262fabec | ||
|
a3296214cc | ||
|
6f0c596658 | ||
|
4be030e62f | ||
|
371572e80c | ||
|
14389a53f6 | ||
|
76be5dc586 | ||
|
91208ff17e | ||
|
1de82e9abc | ||
|
908087dc27 | ||
|
7be28fb16d | ||
|
666f8a2917 | ||
|
c3bea11624 | ||
|
fcbb8d4397 | ||
|
9d6d92d1dd | ||
|
28ec374131 | ||
|
f16195a275 | ||
|
599f6e9799 | ||
|
6d22d8a0f0 | ||
|
250b9dbf19 | ||
|
600844bb07 | ||
|
e23647e38b | ||
|
3fdac3c5ed | ||
|
0abf9e40cd | ||
|
73f6f25b33 | ||
|
91eb624d87 | ||
|
2de2d2ea4b | ||
|
12629b9996 | ||
|
293eb05468 | ||
|
05c74f0da5 | ||
|
6b22186693 | ||
|
243e375b74 | ||
|
90f6bdb48f | ||
|
d460e33a11 | ||
|
ace78713a9 | ||
|
29d364498e | ||
|
58b6dc4d55 |
7 changed files with 651 additions and 267 deletions
|
@ -991,7 +991,6 @@ dist_patch_DATA = \
|
|||
%D%/packages/patches/antiword-CVE-2014-8123.patch \
|
||||
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
|
||||
%D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
|
||||
%D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
|
||||
%D%/packages/patches/apr-fix-atomics.patch \
|
||||
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
||||
%D%/packages/patches/aria-maestosa-scons-python3.patch \
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -744,7 +744,12 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
|
|||
(substitute-keyword-arguments `(#:strip-binaries? #f
|
||||
,@(package-arguments emacs))
|
||||
((#:configure-flags flags ''())
|
||||
#~`("CFLAGS=-Og -ggdb3"
|
||||
#~`(#$(string-append "CFLAGS=-Og -ggdb3"
|
||||
" -Wno-error=implicit-function-declaration"
|
||||
" -Wno-error=implicit-int"
|
||||
" -Wno-error=incompatible-pointer-types"
|
||||
" -Wno-error=int-conversion"
|
||||
" -Wno-error=shift-count-negative")
|
||||
"--with-native-compilation=no"
|
||||
"--without-modules"
|
||||
"--without-threads"
|
||||
|
@ -752,7 +757,9 @@ Started in 2014 as a GSOC project, Guile-Emacs was resurrected in 2024.")
|
|||
"--without-cairo"
|
||||
"--without-tree-sitter"
|
||||
"--with-imagemagick"
|
||||
,@(fold delete #$flags '("--with-cairo"
|
||||
,@(fold delete #$flags
|
||||
'("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types"
|
||||
"--with-cairo"
|
||||
"--with-modules"
|
||||
"--with-native-compilation=aot"))))
|
||||
((#:make-flags flags #~'())
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
This patch was borrowed from Debian's package:
|
||||
https://salsa.debian.org/debian-astro-team/aoflagger/-/blob/0484ef75a663e3e07738550cdade46f433a53dac/debian/patches/Use-system-provided-pybind11.patch
|
||||
Description: Use system provided pybind11
|
||||
Author: Ole Streicher <olebole@debian.org>
|
||||
Origin: Debian
|
||||
Last-Update: Mon, 30 Aug 2021 11:05:37 +0200
|
||||
---
|
||||
CMakeLists.txt | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 655ea5e..824ee2a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -62,11 +62,6 @@ foreach(ExternalSubmodule IN LISTS ExternalSubmoduleDirectories)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
-# Include aocommon/pybind11 headers
|
||||
-include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include")
|
||||
-add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11")
|
||||
-include_directories(SYSTEM ${pybind11_INCLUDE_DIR})
|
||||
-
|
||||
find_package(
|
||||
HDF5
|
||||
COMPONENTS C CXX
|
||||
@@ -101,6 +96,11 @@ find_package(PythonInterp REQUIRED)
|
||||
message(STATUS "Using python version ${PYTHON_VERSION_STRING}")
|
||||
include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS})
|
||||
|
||||
+# Include pybind11 headers
|
||||
+find_package(pybind11 REQUIRED)
|
||||
+include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include")
|
||||
+include_directories(${pybind11_INCLUDE_DIR})
|
||||
+
|
||||
# boost::alignment requires Boost 1.56
|
||||
find_package(Boost 1.56.0 REQUIRED COMPONENTS date_time filesystem system
|
||||
unit_test_framework)
|
|
@ -185,7 +185,7 @@ it.")
|
|||
(define-public trealla
|
||||
(package
|
||||
(name "trealla")
|
||||
(version "2.83.5")
|
||||
(version "2.83.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -194,7 +194,7 @@ it.")
|
|||
(url "https://github.com/trealla-prolog/trealla")
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32 "04d1h8331dsb1gbrp28h2sqkwqh3cfzbdlziczwqk2kyyp9sf9f8"))
|
||||
(base32 "1bpfzrwsgbmjl1maiaw5b8ixkgh548gw1lkiznsjgkjm7dxr4ns4"))
|
||||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
|
|
|
@ -1777,6 +1777,31 @@ data arrays produced during tests, in particular in cases where the arrays
|
|||
are too large to conveniently hard-code them in the tests.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-pytest-asdf-plugin
|
||||
(package
|
||||
(name "python-pytest-asdf-plugin")
|
||||
(version "0.1.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "pytest_asdf_plugin" version))
|
||||
(sha256
|
||||
(base32 "0bcfl1s7yrnr2rlpr3hswcg9jyq6gnj0ppmpzppw9xgj796ycfb5"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f ;to avoid import astronomy module
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(delete 'sanity-check))))
|
||||
(native-inputs
|
||||
(list python-setuptools-next
|
||||
python-setuptools-scm-next))
|
||||
(home-page "https://github.com/asdf-format/pytest-asdf-plugin")
|
||||
(synopsis "Pytest plugin for testing ASDF schemas")
|
||||
(description
|
||||
"This package provides a Pytest plugin for testing ASDF schemas.")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public python-pytest-astropy
|
||||
(package
|
||||
(name "python-pytest-astropy")
|
||||
|
|
|
@ -4224,7 +4224,11 @@ will reconstruct the object along its delta-base chain and return it.")
|
|||
(install-file manpage
|
||||
(string-append #$output "/share/man/man1")))
|
||||
(find-files "." "^git-lfs.*\\.1$"))))))
|
||||
#~()))))
|
||||
#~())
|
||||
(add-after 'install 'rename-binary
|
||||
(lambda _
|
||||
(with-directory-excursion (string-append #$output "/bin")
|
||||
(rename-file "v3" "git-lfs")))))))
|
||||
(native-inputs
|
||||
(append (list git-minimal
|
||||
go-github-com-avast-retry-go
|
||||
|
@ -4251,7 +4255,7 @@ will reconstruct the object along its delta-base chain and return it.")
|
|||
(if (supported-package? ruby-asciidoctor/minimal)
|
||||
(list ronn-ng ruby-asciidoctor/minimal)
|
||||
'())))
|
||||
(home-page "https://git-lfs.github.com/")
|
||||
(home-page "https://git-lfs.com/")
|
||||
(synopsis "Git extension for versioning large files")
|
||||
(description
|
||||
"Git Large File Storage (LFS) replaces large files such as audio samples,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue