diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/dezyne.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/dezyne-add-missing-shebangs.patch | 61 |
3 files changed, 2 insertions, 65 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 4566f1b4a4..e65888a044 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1055,7 +1055,6 @@ dist_patch_DATA = \ %D%/packages/patches/dee-vapi.patch \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ - %D%/packages/patches/dezyne-add-missing-shebangs.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index c13374069f..ef2130a940 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -32,15 +32,14 @@ (define-public dezyne (package (name "dezyne") - (version "2.17.2") + (version "2.17.3") (source (origin (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) - (patches (search-patches "dezyne-add-missing-shebangs.patch")) (sha256 - (base32 "1v0anwr0iic26ck796b29dfyj1dxkjf935g134z98s95hvzzrhm3")))) + (base32 "0x2aqfvbxhiwxj6vm17g7dkxwj8skcs9pg3a3l1x9pxy7v22wxd7")))) (inputs (list bash-minimal guile-3.0-latest guile-json-4 diff --git a/gnu/packages/patches/dezyne-add-missing-shebangs.patch b/gnu/packages/patches/dezyne-add-missing-shebangs.patch deleted file mode 100644 index bf88e95c8a..0000000000 --- a/gnu/packages/patches/dezyne-add-missing-shebangs.patch +++ /dev/null @@ -1,61 +0,0 @@ -Upstream status: Taken from upstream development. - -From aace425e41247c1dd6b16eb7eabce50be7310d15 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen <janneke@gnu.org> -Date: Mon, 24 Apr 2023 16:58:32 +0200 -Subject: [PATCH] DRAFT test: Add missing shebangs to run scripts. - -This fixes `make check' on current ci.guix.gnu.org. - -* test/all/parse_import_order/run, -test/all/parse_locations/run, -test/all/parse_peg_locations/run: Add #! /bin/sh. ---- - test/all/parse_import_order/run | 3 ++- - test/all/parse_locations/run | 3 ++- - test/all/parse_peg_locations/run | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/test/all/parse_import_order/run b/test/all/parse_import_order/run -index 6e231de4f9..c383e4f223 100755 ---- a/test/all/parse_import_order/run -+++ b/test/all/parse_import_order/run -@@ -1,6 +1,7 @@ -+#! /bin/sh - # Dezyne --- Dezyne command line tools - # --# Copyright © 2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> -+# Copyright © 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> - # - # This file is part of Dezyne. - # -diff --git a/test/all/parse_locations/run b/test/all/parse_locations/run -index 0b092b26dd..6c48ee1392 100755 ---- a/test/all/parse_locations/run -+++ b/test/all/parse_locations/run -@@ -1,7 +1,8 @@ -+#! /bin/sh - # Dezyne --- Dezyne command line tools - # - # Copyright © 2021 Paul Hoogendijk <paul@dezyne.org> --# Copyright © 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> -+# Copyright © 2020, 2021, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> - # - # This file is part of Dezyne. - # -diff --git a/test/all/parse_peg_locations/run b/test/all/parse_peg_locations/run -index 5b5ced0bb4..5206a23db6 100755 ---- a/test/all/parse_peg_locations/run -+++ b/test/all/parse_peg_locations/run -@@ -1,6 +1,7 @@ -+#! /bin/sh - # Dezyne --- Dezyne command line tools - # --# Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> -+# Copyright © 2020, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> - # - # This file is part of Dezyne. - # --- -2.39.2 - |