ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tinydir: Update to 1.2.6.

Browse source 
* gnu/packages/c.scm (tinydir): Update to 1.2.6.
* gnu/packages/patches/tinydir-fix-cbehave-test.patch: Adjust patch.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
David Elsing 2024-01-28 23:01:54 +00:00 committed by Christopher Baines
parent 68bc23a5ba
commit 5a8079e219
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/c.scm
View file

@ -20,7 +20,7 @@
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;; Copyright © 2023 David Elsing <david.elsing@posteo.net> ;;; Copyright © 2023, 2024 David Elsing <david.elsing@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1349,7 +1349,7 @@ (define target-machine #$(and=> (%current-target-system)
(define-public tinydir (define-public tinydir
(package (package
(name "tinydir") (name "tinydir")
(version "1.2.5") (version "1.2.6")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1358,7 +1358,7 @@ (define-public tinydir
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1nprgdfx4i8wzc1idw6chan4fjfa75b5ll8kghdc0q2278pny259")) "143n6yabznxk032gv5g2k8glf0kzicarg9cx0714zsbfmzj8lr07"))
(patches (search-patches "tinydir-fix-cbehave-test.patch")) (patches (search-patches "tinydir-fix-cbehave-test.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(delete-file-recursively "tests/cbehave")))) (snippet '(delete-file-recursively "tests/cbehave"))))

16
gnu/packages/patches/tinydir-fix-cbehave-test.patch
View file

@ -2,10 +2,22 @@ Make test work with upstream cbehave
(tinydir bundles a modified version) (tinydir bundles a modified version)
diff --git a/tests/file_open_test.c b/tests/file_open_test.c diff --git a/tests/file_open_test.c b/tests/file_open_test.c
index 3e659bc..9f6f88d 100644 index 09b856e..92b13ca 100644
--- a/tests/file_open_test.c --- a/tests/file_open_test.c
+++ b/tests/file_open_test.c +++ b/tests/file_open_test.c
@@ -19,4 +19,7 @@ FEATURE(file_open, "File open") @@ -4,6 +4,11 @@
#include "cbehave.h"
#include "util.h"
+#define ASSERT(cond, ret) \
+if (!(cond)) {\
+ cbehave_feature_return(__FILE__, __LINE__, ret, _state); \
+ goto _feature_over; \
+}\
FEATURE(file_open, "File open")
SCENARIO("Open file in current directory")
@@ -34,4 +39,7 @@ FEATURE(file_open, "File open")
SCENARIO_END SCENARIO_END
FEATURE_END FEATURE_END