diff options
| author | Marius Bakke <marius@gnu.org> | 2022-11-20 07:49:11 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-11-20 07:49:11 +0100 |
| commit | 7d5e045a691fcdbbfb1e75e4f4660396403c1d8d (patch) | |
| tree | fab0d21a5bc004969f9011ce60907754244c218a /gnu/local.mk | |
| parent | b187864f36e7f8ce584a002d28b275c6bf9fced2 (diff) | |
| parent | 8cef05bab6251978018ccab7bb44883676ce8f6c (diff) | |
| download | guix-7d5e045a691fcdbbfb1e75e4f4660396403c1d8d.tar guix-7d5e045a691fcdbbfb1e75e4f4660396403c1d8d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8f59fb5faf..a630af7a0b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -55,6 +55,7 @@ # Copyright © 2022 Hilton Chain <hako@ultrarare.space> # Copyright © 2022 Alex Griffin <a@ajgrf.com> # Copyright © 2022 ( <paren@disroot.org> +# Copyright © 2022 jgart <jgart@dismail.de> # # This file is part of GNU Guix. # @@ -1537,6 +1538,8 @@ dist_patch_DATA = \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ + %D%/packages/patches/mia-vtk92.patch \ + %D%/packages/patches/mia-vtk-version.patch \ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \ %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ @@ -1795,7 +1798,7 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ - %D%/packages/patches/racket-backport-8.6-zuo.patch \ + %D%/packages/patches/racket-backport-8.7-pkg-strip.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \ @@ -1831,6 +1834,7 @@ dist_patch_DATA = \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ + %D%/packages/patches/sbcl-fix-build-on-arm64-with-clisp-as-host.patch \ %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ %D%/packages/patches/scalapack-gcc-10-compilation.patch \ %D%/packages/patches/scheme48-tests.patch \ @@ -1882,7 +1886,6 @@ dist_patch_DATA = \ %D%/packages/patches/tao-fix-parser-types.patch \ %D%/packages/patches/tar-remove-wholesparse-check.patch \ %D%/packages/patches/tar-skip-unreliable-tests.patch \ - %D%/packages/patches/tbb-fix-test-on-aarch64.patch \ %D%/packages/patches/tbb-other-arches.patch \ %D%/packages/patches/tclxml-3.2-install.patch \ %D%/packages/patches/tcsh-fix-autotest.patch \ @@ -1896,7 +1899,6 @@ dist_patch_DATA = \ %D%/packages/patches/texlive-hyph-utf8-no-byebug.patch \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ - %D%/packages/patches/timescaledb-flaky-test.patch \ %D%/packages/patches/tinyxml-use-stl.patch \ %D%/packages/patches/tipp10-disable-downloader.patch \ %D%/packages/patches/tipp10-fix-compiling.patch \ @@ -1983,7 +1985,6 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ - %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/vtk-7-gcc-10-compat.patch \ %D%/packages/patches/vtk-7-hdf5-compat.patch \ %D%/packages/patches/vtk-7-python-compat.patch \ |