push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,21 @@
--- a/cephes.asd
+++ b/cephes.asd
@@ -16,7 +16,7 @@
(defclass makefile (source-file) ((type :initform "m")))
(defmethod perform ((o load-op) (c makefile)) t)
(defmethod perform ((o compile-op) (c makefile))
- (let* ((lib-dir (system-relative-pathname "cephes" "scipy-cephes/"))
+ (let* ((lib-dir #P"@out@/scipy-cephes/")
(lib (make-pathname :directory (pathname-directory lib-dir)
:name #+(or (and unix (not darwin)) windows win32) "libmd"
#+(and darwin arm64) "libmd-arm64"
@@ -30,7 +30,7 @@
(format *error-output* "Library ~S exists, skipping build" lib)
(format *error-output* "Building ~S~%" lib))
(unless built
- (chdir (native-namestring lib-dir))
+ (chdir "scipy-cephes")
(run-program "make" :output t)))))
(defsystem "cephes"

View File

@@ -0,0 +1,14 @@
--- a/libffi/libffi-types.lisp
+++ b/libffi/libffi-types.lisp
@@ -43,9 +43,6 @@
(pkg-config-cflags "libffi" :optional t)
-#+darwin
-(include "ffi/ffi.h")
-#-darwin
(include "ffi.h")
(cenum status
Diff finished. Sun Nov 13 00:23:10 2022

View File

@@ -0,0 +1,16 @@
--- a/src/ffi/grovel/grovel-freetype.h
+++ b/src/ffi/grovel/grovel-freetype.h
@@ -2,7 +2,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <ftsystem.h>
-#include <fttypes.h>
-#include <ftlist.h>
-#include <ftimage.h>
+#include <freetype/ftsystem.h>
+#include <freetype/fttypes.h>
+#include <freetype/ftlist.h>
+#include <freetype/ftimage.h>
Diff finished. Mon Nov 14 22:41:57 2022

View File

@@ -0,0 +1,26 @@
From 2040fcab5a7be2f28add46a1412bef62ac5ccf11 Mon Sep 17 00:00:00 2001
From: Maximilian Marx <mmarx@wh2.tu-dresden.de>
Date: Thu, 24 Nov 2022 20:00:33 +0100
Subject: [PATCH] Use glucose binary from PATH if present
---
src/package.lisp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/package.lisp b/src/package.lisp
index b6e26ac..bdb2581 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -13,7 +13,9 @@
(defvar *glucose-home* (asdf:system-relative-pathname :cl-sat.glucose "glucose-syrup/"))
(defun glucose-binary (&optional (*glucose-home* *glucose-home*))
- (merge-pathnames "simp/glucose_static" *glucose-home*))
+ (if (trivial-package-manager:which "glucose")
+ "glucose"
+ (merge-pathnames "simp/glucose_static" *glucose-home*)))
(defmethod solve ((input pathname) (solver (eql :glucose)) &rest options &key debug &allow-other-keys)
(remf options :debug)
--
2.36.2

View File

@@ -0,0 +1,22 @@
--- a/testsuite/assertions.lisp
+++ b/testsuite/assertions.lisp
@@ -13,7 +13,7 @@
relation when computing with floating point numbers. Two floating point numbers are
essentially equal when they are in a neighbourhood whose size is based
on the magnitude orders of these floating point numbers and the inaccuracy."
- (:report
+ :report
(lambda (stream)
(flet ((maybe-report (name float1 float2)
(unless (float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy)
@@ -29,7 +29,7 @@
inaccuracy (confidence::float-comparison-threshold 'single-float max inaccuracy float1 float2)))))
(maybe-report "X" (p:x point1) (p:x point2))
(maybe-report "Y" (p:y point1) (p:y point2))
- (maybe-report "Z" (p:z point1) (p:z point2)))))
+ (maybe-report "Z" (p:z point1) (p:z point2))))
(and (float-is-essentially-equal (p:x point1) (p:x point2) :inaccuracy inaccuracy)
(float-is-essentially-equal (p:y point1) (p:y point2) :inaccuracy inaccuracy)
(float-is-essentially-equal (p:z point1) (p:z point2) :inaccuracy inaccuracy)))
Diff finished. Sun Oct 20 03:05:54 2024

View File

@@ -0,0 +1,32 @@
--- a/src/gnuplot/gnuplot.lisp
+++ b/src/gnuplot/gnuplot.lisp
@@ -24,8 +24,13 @@
(in-package :math/gnuplot)
-(defparameter *default-gnuplot-direcroty*
- (ensure-directories-exist #P"~/gnuplot/"))
+
+
+(defun default-gnuplot-directory ()
+ (let ((directory (merge-pathnames
+ (make-pathname :directory '(:relative "gnuplot"))
+ (user-homedir-pathname))))
+ (ensure-directories-exist directory)))
;;;; (directory-namestring *default-gnuplot-direcroty*)
@@ -33,9 +38,9 @@
(assert (stringp f-name))
(assert (stringp f-ext))
(if (string= "" f-ext)
- (concatenate 'string (directory-namestring *default-gnuplot-direcroty*)
+ (concatenate 'string (directory-namestring (default-gnuplot-directory))
f-name f-ext)
- (concatenate 'string (directory-namestring *default-gnuplot-direcroty*)
+ (concatenate 'string (directory-namestring (default-gnuplot-directory))
f-name "." f-ext)))
(defun find-font-family (&key (family "Times New Roman"))
Diff finished. Fri Mar 10 20:05:26 2023

View File

@@ -0,0 +1,28 @@
Prevent swank from attempting write into storeDir
--- a/swank-loader.lisp
+++ b/swank-loader.lisp
@@ -162,7 +162,7 @@
,(unique-dir-name)))
(user-homedir-pathname)))
-(defvar *fasl-directory* (default-fasl-dir)
+(defvar *fasl-directory* #P"@out@/fasl/"
"The directory where fasl files should be placed.")
(defun binary-pathname (src-pathname binary-dir)
@@ -284,12 +284,7 @@
(contrib-dir src-dir))))
(defun delete-stale-contrib-fasl-files (swank-files contrib-files fasl-dir)
- (let ((newest (reduce #'max (mapcar #'file-write-date swank-files))))
- (dolist (src contrib-files)
- (let ((fasl (binary-pathname src fasl-dir)))
- (when (and (probe-file fasl)
- (<= (file-write-date fasl) newest))
- (delete-file fasl))))))
+ (declare (ignore swank-files contrib-files fasl-dir)))
(defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))
(fasl-dir (contrib-dir *fasl-directory*))
Diff finished. Sat Jan 22 23:57:27 2022