sharlatan pushed a commit to branch ruby-team
in repository guix.
commit 8cc127df5522a645fd684ecc2419cb277a487084
Author: Nicolas Graves <[email protected]>
AuthorDate: Fri Jan 31 09:19:31 2025 +0100
gnu: fpm: Update to 1.16.0.
* gnu/packages/package-management.scm (fpm): Update to 1.16.0.
[source]<origin>(patches): Remove patch.
* gnu/local.mk: Remove patch.
* gnu/packages/patches/fpm-newer-clamp-fix.patch: Remove patch.
Signed-off-by: Sharlatan Hellseher <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/package-management.scm | 5 ++--
gnu/packages/patches/fpm-newer-clamp-fix.patch | 33 --------------------------
3 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f8e2b57ead..d379c2a62f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1320,7 +1320,6 @@ dist_patch_DATA =
\
%D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fpc-glibc-2.34-compat.patch \
- %D%/packages/patches/fpm-newer-clamp-fix.patch \
%D%/packages/patches/freedict-tools-fix-determinism.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freeimage-libtiff-compat.patch \
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index b0e8ad0d2a..5418045bef 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -2173,7 +2173,7 @@ sandboxed desktop applications on GNU/Linux.")
(define-public fpm
(package
(name "fpm")
- (version "1.15.1")
+ (version "1.16.0")
(source (origin
(method git-fetch) ;for tests
(uri (git-reference
@@ -2182,8 +2182,7 @@ sandboxed desktop applications on GNU/Linux.")
(file-name (git-file-name name version))
(sha256
(base32
- "1m2zxf7wyk7psvm611yxs68hnwm0pyqilsmcq3x791hz7rvbg68w"))
- (patches (search-patches "fpm-newer-clamp-fix.patch"))))
+ "0h4yw57y0p0x335767y058lbv46f6xjf3jvv49vxw5vfzzhqbl3c"))))
(build-system ruby-build-system)
(arguments
(list #:phases
diff --git a/gnu/packages/patches/fpm-newer-clamp-fix.patch
b/gnu/packages/patches/fpm-newer-clamp-fix.patch
deleted file mode 100644
index 9fbb15ee29..0000000000
--- a/gnu/packages/patches/fpm-newer-clamp-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Retrieved from: https://github.com/jordansissel/fpm/pull/1561.patch
-
-From 956a218a7b35de08ea35da3b702ffdc716656b68 Mon Sep 17 00:00:00 2001
-From: Jordan Sissel <[email protected]>
-Date: Mon, 15 Oct 2018 21:05:47 -0700
-Subject: [PATCH] Check if an option has a default value before we try to look
- it up.
-
-This fixes fpm when used with clamp 1.3.0 or above.
-
-Fixes #1543
----
- lib/fpm/command.rb | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/lib/fpm/command.rb b/lib/fpm/command.rb
-index a204001e1..a99ddb627 100644
---- a/lib/fpm/command.rb
-+++ b/lib/fpm/command.rb
-@@ -394,7 +394,12 @@ def execute
- set = proc do |object, attribute|
- # if the package's attribute is currently nil *or* the flag setting for
this
- # attribute is non-default, use the value.
-- if object.send(attribute).nil? || send(attribute) !=
send("default_#{attribute}")
-+
-+ # Not all options have a default value, so we assume `nil` if there's
no default. (#1543)
-+ # In clamp >= 1.3.0, options without `:default => ..` will not have any
# `default_xyz`
-+ # methods generated, so we need to check for the presence of this
method first.
-+ default = respond_to?("default_#{attribute}") ?
send("default_#{attribute}") : nil
-+ if object.send(attribute).nil? || send(attribute) != default
- logger.info("Setting from flags: #{attribute}=#{send(attribute)}")
- object.send("#{attribute}=", send(attribute))
- end
