From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Dec 2022 08:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60250@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167169720416116 (code B ref -1); Thu, 22 Dec 2022 08:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2022 08:20:04 +0000 Received: from localhost ([127.0.0.1]:56916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Go7-0004Bs-HA for submit@debbugs.gnu.org; Thu, 22 Dec 2022 03:20:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:55706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Go5-0004Ba-TI for submit@debbugs.gnu.org; Thu, 22 Dec 2022 03:20:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8Go5-0006bx-IC for guix-patches@gnu.org; Thu, 22 Dec 2022 03:20:01 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8Go3-000770-Rr for guix-patches@gnu.org; Thu, 22 Dec 2022 03:20:01 -0500 Date: Thu, 22 Dec 2022 16:19:43 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1671697196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPAKT8FbtwDzcw71LVWNTdUEihrHzTu9YeRR6JtOrr0=; b=F/oievmXK4z0USoxl/l8yqJ4+4prHgCnBbppSaNe92OZfVvL+mPfT0O+IbINbhQhc12ddf J96Sn0uRBSoVoakZyEoRntIpv/X1atp3eZr/KLzvStBn1EXltZLv41IBo8fSSpn+XFIRjt S8tB330Wy1eA7uSDFKbG2gCMBIAg6+RuMiekmozLbGLK08y/DZobe/q0rpIJAfQCG8rFpo mh0GHDT/tqgW+Mncci1Td4RQHvueQaqfvzO0q/YeD77Y/kOJVI78ex26PEPHL95kq3PsUL ns6Bz/ACCqa9R3FNv5Ld1gWxTf9aZ1/ss9KWZfIWWF+2aRKzcIeiY1axPLF5MA== Message-ID: <87k02j4zq8.wl-hako@ultrarare.space> From: Hilton Chain MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/file-systems.scm (bees): New variable. --- gnu/packages/file-systems.scm | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 57a25a0d90..cce406a01d 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1766,3 +1766,42 @@ (define-public udftools and other optical media. It supports read-only media (DVD/CD-R) and rewritable media that wears out (DVD/CD-RW).") (license license:gpl2+))) + +(define-public bees + (package + (name "bees") + (version "0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Zygo/bees") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + (string-append "BEES_VERSION=" #$version) + "PREFIX=''" + "LIBEXEC_PREFIX=/lib/bees") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'fix-path + (lambda _ + (substitute* (string-append #$output "/sbin/beesd") + (("/lib/bees/bees" all) + (string-append #$output all)))))))) + (home-page "https://github.com/Zygo/bees") + (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") + (description + "@code{bees} is a block-oriented userspace deduplication agent designed +for large btrfs filesystems. It is an offline dedupe combined with an +incremental data scan capability to minimize time data spends on disk from +write to dedupe.") + (license license:gpl3+))) base-commit: 0744540d09ddef8dbf25cc5d65da9d029dab338c -- 2.38.1 From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. References: <87k02j4zq8.wl-hako@ultrarare.space> In-Reply-To: <87k02j4zq8.wl-hako@ultrarare.space> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Dec 2022 18:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60250@debbugs.gnu.org Cc: hako@ultrarare.space Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.16717351778103 (code B ref 60250); Thu, 22 Dec 2022 18:53:01 +0000 Received: (at 60250) by debbugs.gnu.org; 22 Dec 2022 18:52:57 +0000 Received: from localhost ([127.0.0.1]:36197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Qgb-00026c-9R for submit@debbugs.gnu.org; Thu, 22 Dec 2022 13:52:57 -0500 Received: from knopi.disroot.org ([178.21.23.139]:53136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8QgY-00026S-GC for 60250@debbugs.gnu.org; Thu, 22 Dec 2022 13:52:55 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E8D2640DDF; Thu, 22 Dec 2022 19:52:52 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8phF1vpUZnAd; Thu, 22 Dec 2022 19:52:50 +0100 (CET) Message-ID: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671735170; bh=ylPWts6WCflIzBNuDPe3XeyAnrJEVuC5GdhjnVFu6wc=; h=Date:To:Subject:Cc:From; b=jCfq1Dk9YJas6IjMKIi8D2f8qrzg6WqeDStvlfKL5GEzB6+6WyYnOmK6jhSqGcy4e KejM8aBYZ7Bik0uyevTErz8jApszTfjbKi2VMdnRXPHbtB99AaeVzuoQrhf6Xeo98S Z1zI5hBo2zC9z9lUOKf6gz+oKgpVuc4I/mZWDgzS2hj2hl329LEa5/OYIIGWS2G4Dy LzBB585tSZ5O3KJwkmO7yAXE1fcWv5NKAUwHS7pqKVwsgW+jVlg1Ya2VHU0oJvr1F7 F9S3K6D55w+2lfA1dFCv44MBGxp7mCVQyTLbneURtLYbdBJHTFb2MrpaCiZn/kBxPJ 5mV1rTL5A7IOg== Date: Thu, 22 Dec 2022 18:52:38 +0000 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, > #~(list (string-append "CC=" #$(cc-for-target)) > + (string-append "DESTDIR=" #$output) > + (string-append "BEES_VERSION=" #$version) > + "PREFIX=''" > + "LIBEXEC_PREFIX=/lib/bees" The LIBEXEC_PREFIX shouldn't be set to this, this is actually a bug with beesd.in and also the sed invocation(or $TEMPLATE_COMPILER which is what it's called in the Makefile). > #~(modify-phases %standard-phases > + (delete 'configure) > + (add-after 'install 'fix-path > + (lambda _ > + (substitute* (string-append #$output "/sbin/beesd") > + (("/lib/bees/bees" all) > + (string-append #$output all)))))))) The 'fix-path phase isn't necessary, and the LIBEXEC_PREFIX doesn't need to be set. The snippet below fixes the bug in bees: > (modules '((guix build utils))) > (snippet > #~(begin > (substitute* "Defines.mk" > (("^sed.*" all) > (string-append all > "\t\t-e's#@DESTDIR@#$(DESTDIR)#' \\\n"))) > (substitute* "scripts/beesd.in" > (("@LIBEXEC_PREFIX@") "@DESTDIR@/@LIBEXEC_PREFIX@")))))) The files lib/city.cc and include/crucible/city.h need to be unbundled and the cityhash included in guix used instead. The cityhash package needs to be in the inputs, and these files need to be deleted as part of the snippet above:> (for-each delete-file > '("lib/city.cc" "include/crucible/city.h")) It appears that bees hasn't been built on a non-systemd distribution, because an optional feature hard fails. This fixes it, the systemd unit files are installed conditionally anyways: > (substitute* "Makefile" > (("pkg-config systemd --variable=systemdsystemunitdir" all) > (string-append all " || true"))) > (substitute* "lib/Makefile" > (("city.o.*") "")) > (substitute* "src/bees-hash.cc" > (("#include .crucible/city.h.") "#include ")) These substitutions remove references to the bundled cityhash(which is 11 years old!) Native inputs and inputs for bees: > (native-inputs > (list pkg-config markdown)) > (inputs > (list cityhash)) All the modifications made as part of the snippet should definitely be upstreamed, could you do that for me? From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. References: <87k02j4zq8.wl-hako@ultrarare.space> In-Reply-To: <87k02j4zq8.wl-hako@ultrarare.space> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Dec 2022 19:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60250@debbugs.gnu.org Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.167173699518219 (code B ref 60250); Thu, 22 Dec 2022 19:24:02 +0000 Received: (at 60250) by debbugs.gnu.org; 22 Dec 2022 19:23:15 +0000 Received: from localhost ([127.0.0.1]:36232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8R9v-0004jn-BI for submit@debbugs.gnu.org; Thu, 22 Dec 2022 14:23:15 -0500 Received: from knopi.disroot.org ([178.21.23.139]:52312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8R9s-0004jf-JF for 60250@debbugs.gnu.org; Thu, 22 Dec 2022 14:23:13 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E30564079E for <60250@debbugs.gnu.org>; Thu, 22 Dec 2022 20:23:10 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JhZeMBKBbJfF for <60250@debbugs.gnu.org>; Thu, 22 Dec 2022 20:23:09 +0100 (CET) Message-ID: <08ad30af-0278-fffb-ec55-9c1a3a3dc578@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671736989; bh=wE40EX9GQfDjvycGMQZCeivSvcJfCieE4E+DMMX12fg=; h=Date:To:Subject:From; b=Abw7lQcqfCMIrAeDtYrbjG2V2Sxx/si7rRM3NWismUd30fr1eQl8EnYH3yEdfy5Ke JOWdiggnbZjkZYglye6SG8Q2ch0WaAcPK9CVwkWYYrYjwzW9HK0QvGM8Wg0q7w8/ou fV3OhtrZ3YUeOOSidn7Tq6vT+uGIwSiVwAlffrDIHvS5tnqJRpezk0tnby28p/ggth ok0U9h9sxIpO9Q9NuRDGotf821lG8fQgQODH95grrN6CSfpt9uUvF2YbfEn8jATfrP ktD7oOh0yhriWjjr+/TuLfTTEvImIExrifz5pNzpRDXIi3qYnR9zsW0fmFj4Xwm1sC 4+Ox1J1jcoZFw== Date: Thu, 22 Dec 2022 19:22:57 +0000 MIME-Version: 1.0 Content-Language: en-US From: Adam Faiz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From the docs/install.md, it looks like btrfs-progs and util-linux(needed for the blkid program) are used at runtime. References to those programs in the source should probably just be substituted in a phase. From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 06:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Adam Faiz Cc: 60250@debbugs.gnu.org Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.167177676113146 (code B ref 60250); Fri, 23 Dec 2022 06:26:02 +0000 Received: (at 60250) by debbugs.gnu.org; 23 Dec 2022 06:26:01 +0000 Received: from localhost ([127.0.0.1]:36721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8bVJ-0003Py-0l for submit@debbugs.gnu.org; Fri, 23 Dec 2022 01:26:01 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:47184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8bVG-0003Pr-6j for 60250@debbugs.gnu.org; Fri, 23 Dec 2022 01:26:00 -0500 Date: Fri, 23 Dec 2022 14:25:38 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1671776751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AHLTXWZJKedE3iGk776qhE0W3fPcTb74XRXGsb+uuOk=; b=PwFw01v+Yb2LUz5XMPofdS6BnH+oPlGSYrgDODyLLiTAeMmXTjWH8Dk+ZtkzOJJo/jyrcA sVyUK+ldwn/4VAOdonAnQGVqxKeZz0nnVwW9giDlkusrWhIFYqU0mpC9BCCseRF09uxee9 Ga00hI9dw13Ur8VXi3Gn3sJqu28Vd4a+L1wJk+JZPLp4wLyOXnSt/DjqMFJTY+qKHNvcRQ f+IXEKDHtV6NLQZz6c8I43o3DB5ZWrrTO5G1VKhAbb72pmbVY9B1JVjqsIWv4bzKqBK35j CZeot6KzURp3aYUJTmXRfOKqcbGrSDS+bGVoEDfCFP9fkUJKN5eXAPBj9NYpyQ== Message-ID: <875ye27i1p.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Adam, On Fri, 23 Dec 2022 02:52:38 +0800, Adam Faiz wrote: > > Hi, > > > #~(list (string-append "CC=" #$(cc-for-target)) > > + (string-append "DESTDIR=" #$output) > > + (string-append "BEES_VERSION=" #$version) > > + "PREFIX=''" > > + "LIBEXEC_PREFIX=/lib/bees" > The LIBEXEC_PREFIX shouldn't be set to this, this is actually a bug with beesd.in and also the sed > invocation(or $TEMPLATE_COMPILER which is what it's called in the Makefile). > > > #~(modify-phases %standard-phases > > + (delete 'configure) > > + (add-after 'install 'fix-path > > + (lambda _ > > + (substitute* (string-append #$output "/sbin/beesd") > > + (("/lib/bees/bees" all) > > + (string-append #$output all)))))))) > The 'fix-path phase isn't necessary, and the LIBEXEC_PREFIX doesn't need to be set. The snippet > below fixes the bug in bees: > > > (modules '((guix build utils))) > > (snippet > > #~(begin > > (substitute* "Defines.mk" > > (("^sed.*" all) > > (string-append all > > "\t\t-e's#@DESTDIR@#$(DESTDIR)#' \\\n"))) > > (substitute* "scripts/beesd.in" > > (("@LIBEXEC_PREFIX@") "@DESTDIR@/@LIBEXEC_PREFIX@")))))) > > The files lib/city.cc and include/crucible/city.h need to be unbundled and the cityhash included in > guix used instead. The cityhash package needs to be in the inputs, and these files need to be > deleted as part of the snippet above:> (for-each delete-file > > '("lib/city.cc" "include/crucible/city.h")) > > It appears that bees hasn't been built on a non-systemd distribution, because an optional feature > hard fails. This fixes it, the systemd unit files are installed conditionally anyways: > > (substitute* "Makefile" > > (("pkg-config systemd --variable=systemdsystemunitdir" all) > > (string-append all " || true"))) > > > (substitute* "lib/Makefile" > > (("city.o.*") "")) > > (substitute* "src/bees-hash.cc" > > (("#include .crucible/city.h.") "#include ")) > These substitutions remove references to the bundled cityhash(which is 11 years old!) > > Native inputs and inputs for bees: > > (native-inputs > > (list pkg-config markdown)) > > (inputs > > (list cityhash)) > > All the modifications made as part of the snippet should definitely be upstreamed, could you do that > for me? Thank you for the snippet and explanation! I've made a pull request (of the beesd part) to the upstream: (And it's merged before I send the mail XDDD) However I'm not sure about the systemd part, could you explain more about which optional feature hard fails? And I get same binaries whether-ever this part is used. As pkg-config is only used for systemd, and markdown for documentations that won't be installed, I'd rather remove them from native-inputs, WDYT? From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH v2] gnu: Add bees. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 06:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60250@debbugs.gnu.org Cc: Adam Faiz Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.167177732313810 (code B ref 60250); Fri, 23 Dec 2022 06:36:02 +0000 Received: (at 60250) by debbugs.gnu.org; 23 Dec 2022 06:35:23 +0000 Received: from localhost ([127.0.0.1]:36728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8beM-0003ag-J9 for submit@debbugs.gnu.org; Fri, 23 Dec 2022 01:35:23 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:40982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8beI-0003aM-G4 for 60250@debbugs.gnu.org; Fri, 23 Dec 2022 01:35:19 -0500 Date: Fri, 23 Dec 2022 14:35:03 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1671777308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lEUhf5wYifsx6d4wYT+RfFSbVc2jJfHojwV5RASQF1E=; b=cZF33Ud6tco008clXCKaOA37PGBeQRCHRXx3DBCCCmU7i0YxXyi9XrK4SAhe2ORAyPngv2 T+RWp8jd4nsEoflAKIp+V1lz4cagjKJRcIOJopxEGjEq1Y4PyPHnvDIZXVoRQ5sOUpHW5Y AqWBKx+AdUBbFsFNkKDXVDPmq+Lc8lNFB1rfxpyiykIDq77nGffGrRtYqwy3M2LTBmfFlu TvXj+miX2O9wyIP6mWyEN0rZpyJUV+cSXkqDX2KMFsx4VW7S3kPGH2+7GAzZHXc153HXin VZhWgtO9D1Jjq1iYgASUSP2y/Btzc53eGyzd5S+mOuhhuQy3JM01J76lWia6/g== Message-ID: <874jtm7hm0.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: <875ye27i1p.wl-hako@ultrarare.space> References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> <875ye27i1p.wl-hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/file-systems.scm (bees): New variable. --- v1 -> v2: 1. Unbundle cityhash. 2. Patch beesd.in for DESTDIR handling. 3. Modify beesd.in to use absolute paths of commands. gnu/local.mk | 1 + gnu/packages/file-systems.scm | 73 +++++++++++++++++++ ...-beesd-honor-destdir-on-installation.patch | 40 ++++++++++ 3 files changed, 114 insertions(+) create mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 45d05de02d..a733d296bd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -935,6 +935,7 @@ dist_patch_DATA = \ %D%/packages/patches/bsd-games-prevent-name-collisions.patch \ %D%/packages/patches/bsd-games-stdio.h.patch \ %D%/packages/patches/beancount-disable-googleapis-fonts.patch \ + %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/bidiv-update-fribidi.patch \ %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 57a25a0d90..b7c681d1fb 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -81,6 +81,7 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages rsync) #:use-module (gnu packages sssd) #:use-module (gnu packages sqlite) + #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -1766,3 +1767,75 @@ (define-public udftools and other optical media. It supports read-only media (DVD/CD-R) and rewritable media that wears out (DVD/CD-RW).") (license license:gpl2+))) + +(define-public bees + (package + (name "bees") + (version "0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Zygo/bees") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + ;; Unbundle cityhash. + #~(begin + (for-each delete-file + '("lib/city.cc" "include/crucible/city.h")) + (substitute* "lib/Makefile" + (("city.o.*") "")) + (substitute* "src/bees-hash.cc" + (("#include .crucible/city.h.") "#include ")))) + (patches + (search-patches + ;; XXX: Cherry-picked from upstream, remove the patch when + ;; bumping version. + "bees-beesd-honor-destdir-on-installation.patch")) + (sha256 + (base32 + "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + (string-append "BEES_VERSION=" #$version) + "PREFIX=''") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fixpath + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/beesd.in" + (((string-append "\\<(" (string-join (list "realpath" + "uuidparse" + "grep" + "false" + "sed" + "true" + "head" + "mkdir" + "mount" + "touch" + "du" + "cut" + "rm" + "truncate" + "chmod") + "|") ")\\>") command) + (search-input-file inputs (string-append "/bin/" command))) + + (("btrfs sub") + (string-append (search-input-file inputs "/bin/btrfs") " sub")))))))) + (inputs (list btrfs-progs cityhash util-linux)) + (home-page "https://github.com/Zygo/bees") + (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") + (description + "@code{bees} is a block-oriented userspace deduplication agent designed +for large btrfs filesystems. It is an offline dedupe combined with an +incremental data scan capability to minimize time data spends on disk from +write to dedupe.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch new file mode 100644 index 0000000000..4800bfc618 --- /dev/null +++ b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch @@ -0,0 +1,40 @@ +From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001 +From: Hilton Chain +Date: Fri, 23 Dec 2022 11:04:46 +0800 +Subject: [PATCH] beesd: Honor DESTDIR on installation. + +Co-authored-by: Adam Faiz +Signed-off-by: Hilton Chain +--- + 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 + base-commit: 1b29fccff2334fb5d6e979a290233a452969e39b -- 2.38.1 From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Dec 2022 07:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 60250@debbugs.gnu.org Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.167178229216848 (code B ref 60250); Fri, 23 Dec 2022 07:59:02 +0000 Received: (at 60250) by debbugs.gnu.org; 23 Dec 2022 07:58:12 +0000 Received: from localhost ([127.0.0.1]:36798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8cwW-0004Ng-09 for submit@debbugs.gnu.org; Fri, 23 Dec 2022 02:58:12 -0500 Received: from knopi.disroot.org ([178.21.23.139]:50906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8cwT-0004Na-3b for 60250@debbugs.gnu.org; Fri, 23 Dec 2022 02:58:10 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4871640A23; Fri, 23 Dec 2022 08:58:07 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bm6F1vcxfTlM; Fri, 23 Dec 2022 08:58:06 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671782285; bh=uItTL/piqJ/433ivWgCR6lSXZCXBi4WhYmOULvn8xLg=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=H8yJttzjB03zujxTlrX5kVthB7PXVyaIXCfH7GcvjZ9JzTRBgUPlWkK6sCdlcQrd9 3NJdmksyZyp+zI3CkF3ihZetyZVvnnZVy3F8tqt+x0KsbqpXqpUqNn97TeEIJ1Z0TG Fd5/ZrGmLTEpaUiAt7aDeHH5pO3BmXLVyZ0dGxO429QTwTc22ClNoNk643hgIfxR6Z 1lQyT0C/9E7aWtvNaH5WlyPzeV6PTiJvmVQeaTn3YHqwfWHK7rD+CpfnBbGUn+gsuP OhrqQngid1BtSpHPntEJaF9jVey2bnTrLarwZS5VaTN/68zJNzKn+/X3tFv/WHwalR tTr8rTfpE5Ezg== Date: Fri, 23 Dec 2022 15:57:53 +0800 MIME-Version: 1.0 Content-Language: en-US References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> <875ye27i1p.wl-hako@ultrarare.space> From: Adam Faiz In-Reply-To: <875ye27i1p.wl-hako@ultrarare.space> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/23/22 14:25, Hilton Chain wrote: > Hi Adam, > > On Fri, 23 Dec 2022 02:52:38 +0800, > Adam Faiz wrote: >> >> Hi, >> >> It appears that bees hasn't been built on a non-systemd distribution, because an optional feature >> hard fails. This fixes it, the systemd unit files are installed conditionally anyways: >>> (substitute* "Makefile" >>> (("pkg-config systemd --variable=systemdsystemunitdir" all) >>> (string-append all " || true"))) > Thank you for the snippet and explanation! > > I've made a pull request (of the beesd part) to the upstream: > > > (And it's merged before I send the mail XDDD) > > However I'm not sure about the systemd part, could you explain more about which optional feature > hard fails? And I get same binaries whether-ever this part is used. I had a problem earlier, but I can't reproduce it now. You can remove this one. > As pkg-config is only used for systemd, and markdown for documentations that won't be installed, > I'd rather remove them from native-inputs, WDYT? I agree that it should be done, but it's a shame that there's no install_docs rule in the Makefile. That should be a feature request/patch. I already have a bees-remove-bundled-cityhash.patch and bees-add-cityhash-to-install.md.patch to send upstream. Should I email them to you? From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Dec 2022 11:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Adam Faiz Cc: 60250@debbugs.gnu.org Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.167188171820848 (code B ref 60250); Sat, 24 Dec 2022 11:36:02 +0000 Received: (at 60250) by debbugs.gnu.org; 24 Dec 2022 11:35:18 +0000 Received: from localhost ([127.0.0.1]:42527 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p92oA-0005QB-4r for submit@debbugs.gnu.org; Sat, 24 Dec 2022 06:35:18 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:56200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p92o7-0005Pt-O6 for 60250@debbugs.gnu.org; Sat, 24 Dec 2022 06:35:16 -0500 Date: Sat, 24 Dec 2022 19:34:32 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1671881708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=v03DWMNbi/rZU2co9fKu7Ut0vaHLPOQ3v94s7qopwfs=; b=N740KQohDtRyEStwTH2xAXIyrpNk5XnsB/vqJ2QrusXhW1jnWexnuK7R6mtr6LhI8GKfLd TF73zCXd14U9e/QpYSwtsSDjLGHdHYXj/ddgMGaNkge06edW9t5ad33fPSllucteSLRB6M WUszC6LXXbIpido49SWm7TGwU5YuJdRnVJdiibQtmX6SN2obqxoKRYp0f4UnoEBb6pRwTB zfwjGvahZXLIFGKuoJ3exQCvvudO4YeTl++AYvmh7zxvGUWnJvLNXiTp2Qv02oGQCK105I mahuOUejN1eF8Xbyb1Aod2MKSE2r7AphV/Ux2Ee2qmdFVfG2heMFgK0p26RVrA== Message-ID: <87cz89xcfr.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> <875ye27i1p.wl-hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Fri, 23 Dec 2022 15:57:53 +0800, Adam Faiz wrote: > > As pkg-config is only used for systemd, and markdown for documentations that won't be installed, > > I'd rather remove them from native-inputs, WDYT? > I agree that it should be done, but it's a shame that there's no install_docs rule in the > Makefile. That should be a feature request/patch. > > I already have a bees-remove-bundled-cityhash.patch and bees-add-cityhash-to-install.md.patch to > send upstream. Should I email them to you? As v2 has unbundled cityhash, there's no need to send the patches to me. One thing to mention is that, according to Repology[1], cityhash is not widely packaged, as a result, it might be better to implement the unbundle as an option. [1]: From unknown Sat Aug 09 05:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#60250] [PATCH] gnu: Add bees. Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Dec 2022 16:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60250 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 60250@debbugs.gnu.org Received: via spool by 60250-submit@debbugs.gnu.org id=B60250.16718995082144 (code B ref 60250); Sat, 24 Dec 2022 16:32:01 +0000 Received: (at 60250) by debbugs.gnu.org; 24 Dec 2022 16:31:48 +0000 Received: from localhost ([127.0.0.1]:47009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p97R5-0000YU-Ji for submit@debbugs.gnu.org; Sat, 24 Dec 2022 11:31:47 -0500 Received: from knopi.disroot.org ([178.21.23.139]:48966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p97R2-0000YG-Su for 60250@debbugs.gnu.org; Sat, 24 Dec 2022 11:31:45 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2BCF940884; Sat, 24 Dec 2022 17:31:43 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JoVA89loDMI2; Sat, 24 Dec 2022 17:31:41 +0100 (CET) Message-ID: <333e7b0f-0d53-ac85-191d-cedf57094e9a@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1671899501; bh=FZsdi9am7ObG/Hi1Kp5TOjuDvA7wRM7K+MSFVY8YUkM=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=hMVvMg1JwkTLfoBdiNmJaSqA33yI9HSYFE97DvPOobNKd7gC/VEV+B/w7ySrm8aTZ S8p2ipP7/4fe90T7D8QTZ5CTfqka9xJKrFhsdFUA7V6+W1H/XNEu4rKwm8WSZNVlpN TMT9I7ORKWumQoFthqfYCyfZf/aHYifYIg+uaZe6Xt/oQR5HzRVIB8AHMnPlGr1Tr1 coefuEIex7ji7jwvdnVDo6P8U+TtH9GbIciSyDBD7Aky0C35aqj0hpQeDcaEnirjSj lAwlbpCjoo5d+Cj0WI/TjfooVK5JjUuKM1ZLpWpsoIixEe1Jw5Lp3T4GhHaINAG2ht OvHc/wcHFqXvQ== Date: Sun, 25 Dec 2022 00:31:37 +0800 MIME-Version: 1.0 References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> <875ye27i1p.wl-hako@ultrarare.space> <87cz89xcfr.wl-hako@ultrarare.space> Content-Language: en-US From: Adam Faiz In-Reply-To: <87cz89xcfr.wl-hako@ultrarare.space> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/24/22 19:34, Hilton Chain wrote: > On Fri, 23 Dec 2022 15:57:53 +0800, > Adam Faiz wrote: >>> As pkg-config is only used for systemd, and markdown for documentations that won't be installed, >>> I'd rather remove them from native-inputs, WDYT? >> I agree that it should be done, but it's a shame that there's no install_docs rule in the >> Makefile. That should be a feature request/patch. >> >> I already have a bees-remove-bundled-cityhash.patch and bees-add-cityhash-to-install.md.patch to >> send upstream. Should I email them to you? > > As v2 has unbundled cityhash, there's no need to send the patches to me. > > One thing to mention is that, according to Repology[1], cityhash is not widely packaged, as a > result, it might be better to implement the unbundle as an option. > > [1]: I don't think that should be done. It's all the more reason these distributions need cityhash packaged and people to help them. If they need a reference, they can always look at the cityhash package in guix or other distributions and how they do it. From unknown Sat Aug 09 05:00:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Hilton Chain Subject: bug#60250: closed (Re: bug#60250: [PATCH] gnu: Add bees.) Message-ID: References: <87bkmxgq5s.fsf_-_@gnu.org> <87k02j4zq8.wl-hako@ultrarare.space> X-Gnu-PR-Message: they-closed 60250 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 60250@debbugs.gnu.org Date: Tue, 17 Jan 2023 15:03:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1673967782-9152-1" This is a multi-part message in MIME format... ------------=_1673967782-9152-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #60250: [PATCH] gnu: Add bees. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 60250@debbugs.gnu.org. --=20 60250: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D60250 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1673967782-9152-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 60250-done) by debbugs.gnu.org; 17 Jan 2023 15:02:50 +0000 Received: from localhost ([127.0.0.1]:37910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHnU9-0002ND-Os for submit@debbugs.gnu.org; Tue, 17 Jan 2023 10:02:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHnU7-0002N0-8o for 60250-done@debbugs.gnu.org; Tue, 17 Jan 2023 10:02:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHnU1-0000OR-Rf; Tue, 17 Jan 2023 10:02:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=88czjqzhN7P9mib4eVRapXlUbUVjT77kJylGryKyv6k=; b=bPJF3FCHuPKElSslMbVM Flz81tcJIBgjPXSRAPrkEwQ1j6Hf98jgs+AnIfLaJMmgnq+4vRv6vngPyIXOGlNpIpjoj/UH5lLV7 AhCF8uci7Lbfepon6BFgiQIseAVyEDR+v5fMGKNkeIjV2zg/KL6LVu9DKgM+g+iHFjd+AvS5MWJTM OESlQiJ6asdoVYzj4kW4ooLX2/yN9/x+GUu0jDeIteEYsaVc4Nq/n0/hzyXZ3UvOr2fp5hl0xAJzh YND3eZDWoC7ELxGIFETqWQ+i8a/W/CUNNB1ZH/cd/0f5I11a8x5fsfsCs4H43x878N9bDfzebv06Y TQzcdxjNEVxHkA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHnU1-0005z5-8m; Tue, 17 Jan 2023 10:02:41 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Hilton Chain Subject: Re: bug#60250: [PATCH] gnu: Add bees. References: <21e09616-e1cc-05bc-5b9b-6b833198945b@disroot.org> <875ye27i1p.wl-hako@ultrarare.space> <874jtm7hm0.wl-hako@ultrarare.space> Date: Tue, 17 Jan 2023 16:02:39 +0100 In-Reply-To: <874jtm7hm0.wl-hako@ultrarare.space> (Hilton Chain's message of "Fri, 23 Dec 2022 14:35:03 +0800") Message-ID: <87bkmxgq5s.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 60250-done Cc: 60250-done@debbugs.gnu.org, Adam Faiz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Hilton Chain skribis: > * gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: New > file. > * gnu/local.mk (dist_patch_DATA): Add it. > * gnu/packages/file-systems.scm (bees): New variable. > --- > v1 -> v2: > 1. Unbundle cityhash. > 2. Patch beesd.in for DESTDIR handling. > 3. Modify beesd.in to use absolute paths of commands. Applied, thanks! Ludo=E2=80=99. ------------=_1673967782-9152-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 22 Dec 2022 08:20:04 +0000 Received: from localhost ([127.0.0.1]:56916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Go7-0004Bs-HA for submit@debbugs.gnu.org; Thu, 22 Dec 2022 03:20:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:55706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8Go5-0004Ba-TI for submit@debbugs.gnu.org; Thu, 22 Dec 2022 03:20:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8Go5-0006bx-IC for guix-patches@gnu.org; Thu, 22 Dec 2022 03:20:01 -0500 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8Go3-000770-Rr for guix-patches@gnu.org; Thu, 22 Dec 2022 03:20:01 -0500 Date: Thu, 22 Dec 2022 16:19:43 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1671697196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPAKT8FbtwDzcw71LVWNTdUEihrHzTu9YeRR6JtOrr0=; b=F/oievmXK4z0USoxl/l8yqJ4+4prHgCnBbppSaNe92OZfVvL+mPfT0O+IbINbhQhc12ddf J96Sn0uRBSoVoakZyEoRntIpv/X1atp3eZr/KLzvStBn1EXltZLv41IBo8fSSpn+XFIRjt S8tB330Wy1eA7uSDFKbG2gCMBIAg6+RuMiekmozLbGLK08y/DZobe/q0rpIJAfQCG8rFpo mh0GHDT/tqgW+Mncci1Td4RQHvueQaqfvzO0q/YeD77Y/kOJVI78ex26PEPHL95kq3PsUL ns6Bz/ACCqa9R3FNv5Ld1gWxTf9aZ1/ss9KWZfIWWF+2aRKzcIeiY1axPLF5MA== Message-ID: <87k02j4zq8.wl-hako@ultrarare.space> From: Hilton Chain To: guix-patches@gnu.org Subject: [PATCH] gnu: Add bees. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@ultrarare.space; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/file-systems.scm (bees): New variable. --- gnu/packages/file-systems.scm | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 57a25a0d90..cce406a01d 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1766,3 +1766,42 @@ (define-public udftools and other optical media. It supports read-only media (DVD/CD-R) and rewritable media that wears out (DVD/CD-RW).") (license license:gpl2+))) + +(define-public bees + (package + (name "bees") + (version "0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Zygo/bees") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4")))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + (string-append "BEES_VERSION=" #$version) + "PREFIX=''" + "LIBEXEC_PREFIX=/lib/bees") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'fix-path + (lambda _ + (substitute* (string-append #$output "/sbin/beesd") + (("/lib/bees/bees" all) + (string-append #$output all)))))))) + (home-page "https://github.com/Zygo/bees") + (synopsis "Best-Effort Extent-Same, a btrfs dedupe agent") + (description + "@code{bees} is a block-oriented userspace deduplication agent designed +for large btrfs filesystems. It is an offline dedupe combined with an +incremental data scan capability to minimize time data spends on disk from +write to dedupe.") + (license license:gpl3+))) base-commit: 0744540d09ddef8dbf25cc5d65da9d029dab338c -- 2.38.1 ------------=_1673967782-9152-1--