[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: gnu: sane-backends-minimal: Update to 1.0.32.
From: |
guix-commits |
Subject: |
08/08: gnu: sane-backends-minimal: Update to 1.0.32. |
Date: |
Mon, 15 Feb 2021 11:25:26 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 78ce446b20f132025389bff122fb1166b3a3a911
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Mon Feb 15 16:20:39 2021 +0100
gnu: sane-backends-minimal: Update to 1.0.32.
* gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.32.
[arguments]: Adapt the ‘zap-unnecessary-git-dependency’ phase to the new
tools/git-version-gen script.
---
gnu/packages/scanner.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index 08dd871..a97131b 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -43,7 +43,7 @@
(define-public sane-backends-minimal
(package
(name "sane-backends-minimal")
- (version "1.0.31")
+ (version "1.0.32")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -51,7 +51,7 @@
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "161hh2zcs2fh6vxxgavf3m0xbm1gbxkasp10p8964pkzxax8rwqp"))
+ (base32 "13jlqdp7n7z2n78v6idl3ri5idk7ddk9j8wrmh73lba8l9y8xnsi"))
(modules '((guix build utils)))
(snippet
;; Generated HTML files and udev rules normally embed a
@@ -77,9 +77,11 @@
(modify-phases %standard-phases
(add-before 'bootstrap 'zap-unnecessary-git-dependency
(lambda _
- (substitute* "configure.ac"
- (("git describe --dirty")
- (string-append "echo " ,version)))))
+ ;; This runs before default patch-shebangs phase.
+ (substitute* "tools/git-version-gen"
+ (("/bin/sh") (which "sh")))
+ (with-output-to-file ".tarball-version"
+ (lambda _ (format #t ,version)))))
(add-before 'configure 'disable-backends
(lambda _
(setenv "BACKENDS" " ")
- branch master updated (ca372a4 -> 78ce446), guix-commits, 2021/02/15
- 01/08: gnu: emacs-exec-path-from-shell: Fix Texinfo mark-up., guix-commits, 2021/02/15
- 06/08: gnu: sane-backends-minimal: Don't use unstable tarball., guix-commits, 2021/02/15
- 08/08: gnu: sane-backends-minimal: Update to 1.0.32.,
guix-commits <=
- 04/08: gnu: exfatprogs: Update to 1.1.0., guix-commits, 2021/02/15
- 03/08: gnu: w3m: Update to 0.5.3+git20210102., guix-commits, 2021/02/15
- 05/08: gnu: nsd: Update to 4.3.5., guix-commits, 2021/02/15
- 02/08: gnu: Fix copyright notice., guix-commits, 2021/02/15
- 07/08: gnu: sane-backends-minimal: Remove obsolete #t return values., guix-commits, 2021/02/15