diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/nickle.scm | 39 | ||||
| -rw-r--r-- | gnu/packages/patches/nickle-man-release-date.patch | 41 |
3 files changed, 23 insertions, 58 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 31d27ff506a..fabc3b68c93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1982,7 +1982,6 @@ dist_patch_DATA = \ %D%/packages/patches/network-manager-plugin-path.patch \ %D%/packages/patches/newlib-getentropy.patch \ %D%/packages/patches/nginx-socket-cloexec.patch \ - %D%/packages/patches/nickle-man-release-date.patch \ %D%/packages/patches/nlopt_CMake-Assume-working-c-compiler-597.patch \ %D%/packages/patches/nnpack-system-libraries.patch \ %D%/packages/patches/nsis-env-passthru.patch \ diff --git a/gnu/packages/nickle.scm b/gnu/packages/nickle.scm index 13eba5a050b..6e135eb58ae 100644 --- a/gnu/packages/nickle.scm +++ b/gnu/packages/nickle.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2024 Eric Bavier <bavier@posteo.net> +;;; Copyright © 2024,2026 Eric Bavier <bavier@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,35 +20,42 @@ (define-module (gnu packages nickle) #:use-module (gnu packages) + #:use-module (gnu packages algebra) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) - #:use-module (guix build-system gnu) + #:use-module (gnu packages ruby-xyz) + #:use-module (guix build-system meson) #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages)) (define-public nickle (package (name "nickle") - (version "2.97") + (version "2.107") (source (origin (method url-fetch) (uri (string-append "https://nickle.org/release/nickle-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "0gqashcs3r0d1yp6rq6q2ayjdwsjxnd8z0ij55ayrbhn296l7mp2")) - (patches (search-patches "nickle-man-release-date.patch")))) - (build-system gnu-build-system) - (inputs (list readline)) + "1wli8p5fv2ldy51ycc8pcx8rl3ph2wbyiqs21qpjadlvildaaqj0")))) + (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-build-date - (lambda _ - ;; Our patch touches Makefile.am, but rather than rebootstrap, - ;; make the substitution directly in Makefile.in. - (substitute* "Makefile.in" - (("BUILD_DATE") "RELEASE_DATE"))))))) + (list #:phases #~(modify-phases %standard-phases + (add-before 'configure 'disable-benchmarks + ;; Benchmarks would require `gmp` and don't + ;; test anything not already covered by other + ;; tests, so disable them here. + (lambda _ + (substitute* "meson.build" + (("^subdir\\('bench'\\)" &) + (string-append "# " &)))))))) + (native-inputs (list bc bison flex pkg-config ruby-asciidoctor-pdf)) + (inputs (list readline)) (synopsis "Numeric oriented programming language") (description "Nickle is a programming language based prototyping environment with diff --git a/gnu/packages/patches/nickle-man-release-date.patch b/gnu/packages/patches/nickle-man-release-date.patch deleted file mode 100644 index 29f50f2b854..00000000000 --- a/gnu/packages/patches/nickle-man-release-date.patch +++ /dev/null @@ -1,41 +0,0 @@ -Submitted close to upstream at -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070162 - -From 95ff7e9de4ed815e060b1df59b5b2b105307e0d7 Mon Sep 17 00:00:00 2001 -From: Eric Bavier <bavier@posteo.net> -Date: Mon, 29 Apr 2024 23:34:15 -0500 -Subject: [PATCH] Fixes substitution of REALEASE_DATE in nickle.1 - -* Makefile.am (nickle.1): 'BUILD_DATE' -> 'RELEASE_DATE'. -* nickle.1.in: Include version in footer. ---- - Makefile.am | 2 +- - nickle.1.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index ba28ec9..5ed56a3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -96,7 +96,7 @@ RELEASE_FILES = $(TARFILE) $(SIGFILE) $(SRPMFILE) $(RPMFILE) - - nickle.1: nickle.1.in nickle-config.h - sed -e 's,@''VERSION@,$(VERSION),' \ -- -e 's,@''BUILD_DATE@,$(BUILD_DATE),' \ -+ -e 's,@''RELEASE_DATE@,$(RELEASE_DATE),' \ - -e 's,@''pkgdatadir@,$(pkgdatadir),' $(top_srcdir)/nickle.1.in > $@ - - nickle.spec: nickle.spec.in nickle-config.h -diff --git a/nickle.1.in b/nickle.1.in -index 4871ac2..1ab9e08 100644 ---- a/nickle.1.in -+++ b/nickle.1.in -@@ -1,4 +1,4 @@ --.TH NICKLE 1 "@RELEASE_DATE@" -+.TH NICKLE 1 "@RELEASE_DATE@" "nickle @VERSION@" - .SH NAME - nickle \- a desk calculator language - .SH SYNOPSIS --- -2.41.0 - |