[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: gsl-static: Remove variable.
From: |
guix-commits |
Subject: |
02/03: gnu: gsl-static: Remove variable. |
Date: |
Mon, 18 Dec 2023 01:39:09 -0500 (EST) |
efraim pushed a commit to branch core-updates
in repository guix.
commit e440df2a23b72bf7c1bf03d7c0774e0c66b39dea
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Dec 17 17:17:38 2023 +0200
gnu: gsl-static: Remove variable.
* gnu/packages/maths.scm (gsl-static): Remove variable.
* gnu/packages/ocaml.scm (ocaml4.07-gsl-1)[inputs]: Replace gsl-static
with gsl:static.
Change-Id: I20af472e62582b403afa4be80b2d3f725903dabc
---
gnu/packages/maths.scm | 9 ---------
gnu/packages/ocaml.scm | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ad514a4641..8c8af70f1c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -764,15 +764,6 @@ numbers.")
(license license:gpl3+)))
-;; TODO: Merge back into the gsl package as a separate output.
-(define-public gsl-static
- (package/inherit gsl
- (name "gsl-static")
- (arguments
- `(,@(package-arguments gsl)
- #:configure-flags (list "--disable-shared")
- #:make-flags (list "CFLAGS=-fPIC")))))
-
(define-public sleef
(package
(name "sleef")
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 327f3449a3..f0510f0d9f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6279,7 +6279,7 @@ the OCaml language.")
"0nzp43hp8pbjqkrxnwp5lgjrabxayf61h18fjaydi0s5faq6f3xh"))))
(build-system ocaml-build-system)
(inputs
- `(("gsl" ,gsl-static)))
+ `(("gsl" ,(gsl "static"))))
(native-inputs
`(("ocamlbuild" ,ocamlbuild)))
(arguments '())