diff options
author | Morgan Smith <Morgan.J.Smith@outlook.com> | 2023-02-12 13:12:56 -0500 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2023-02-19 01:00:06 +0100 |
commit | 4f08551a83f3a9f5e22c70e51e488f38171e6937 (patch) | |
tree | c519536fc5e46223201b018938c9fa8d28661817 /gnu/packages/patches | |
parent | 1eea158ee5c897e34e098df3c108bf3a233c57d5 (diff) | |
download | guix-4f08551a83f3a9f5e22c70e51e488f38171e6937.tar.gz |
gnu: bees: Update to 0.9.2.
* gnu/packages/file-systems.scm (bees): Update to 0.9.2. [license]: Add two individual licences. * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch deleted file mode 100644 index 93817f42cf..0000000000 --- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001 -From: Hilton Chain <hako@ultrarare.space> -Date: Fri, 23 Dec 2022 11:04:46 +0800 -Subject: [PATCH] beesd: Honor DESTDIR on installation. - -Co-authored-by: Adam Faiz <adam.faiz@disroot.org> -Signed-off-by: Hilton Chain <hako@ultrarare.space> ---- - Defines.mk | 1 + - scripts/beesd.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Defines.mk b/Defines.mk -index 9e8df40..e5394ba 100644 ---- a/Defines.mk -+++ b/Defines.mk -@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI - - define TEMPLATE_COMPILER = - sed $< >$@ \ -+ -e's#@DESTDIR@#$(DESTDIR)#' \ - -e's#@PREFIX@#$(PREFIX)#' \ - -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \ - -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#' -diff --git a/scripts/beesd.in b/scripts/beesd.in -index 174bb6c..35d04aa 100755 ---- a/scripts/beesd.in -+++ b/scripts/beesd.in -@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))" - readonly AL16M="$((16*1024*1024))" - readonly CONFIG_DIR=@ETC_PREFIX@/bees/ - --readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees) -+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees) - - command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent" - --- -2.38.1 - |