From patchwork Wed Feb 9 09:53:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 37130 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9165F27BBEA; Wed, 9 Feb 2022 09:56:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF5F927BBE9 for ; Wed, 9 Feb 2022 09:56:18 +0000 (GMT) Received: from localhost ([::1]:56384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHjhx-0004PJ-RR for patchwork@mira.cbaines.net; Wed, 09 Feb 2022 04:56:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHjfm-00045Y-G4 for guix-patches@gnu.org; Wed, 09 Feb 2022 04:54:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHjfl-0007Qz-Vg for guix-patches@gnu.org; Wed, 09 Feb 2022 04:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHjfl-00051M-VP for guix-patches@gnu.org; Wed, 09 Feb 2022 04:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53815] [PATCH v2 1/3] gnu: Add libnitrokey References: In-Reply-To: Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Feb 2022 09:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53815 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 53815@debbugs.gnu.org Received: via spool by 53815-submit@debbugs.gnu.org id=B53815.164440041619239 (code B ref 53815); Wed, 09 Feb 2022 09:54:01 +0000 Received: (at 53815) by debbugs.gnu.org; 9 Feb 2022 09:53:36 +0000 Received: from localhost ([127.0.0.1]:49911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHjfM-00050F-0Y for submit@debbugs.gnu.org; Wed, 09 Feb 2022 04:53:36 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:62157) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHjfJ-000500-UB for 53815@debbugs.gnu.org; Wed, 09 Feb 2022 04:53:34 -0500 Date: Wed, 09 Feb 2022 09:53:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1644400406; bh=+bFFxGvSvDOM4/gvSZ7PZZItfmVARoARtwQ56a66AYg=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=meG0iBvfWBBDKJ0S1qB2IP9fvLrF3wEhydyHmm40MygHMLQ37lYsV94MPpLVDjoaZ n6qMHt4Cgwu6qlHy8qsT1xp4yHM4HuLePpd82rH8iSh9KALHUVo+zM7xIfbMuA2V3z wx3Q5qfmoMgY/p4xvUM9RpzwacY/nn6QokeNXOzahbotqKDCLfvf76D0s1j8+OdkZR /CcZTlNx/z4XQFoPaqJeUFcigMPp3gNZlHR6fuvSwOx7tdotzCJdiqxdQ99zq0GoZO EzYRtSbG8CCWVs9L/f0+YjZ+V6GLbb+C7lF5cyVf5WKmHhk3BuVyHyg0Rew0EtuNS0 bBpEdEW3YeuQA== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Maxime, > phodina via Guix-patches via schreef op zo 06-02-2022 om 07:46 [+0000]: > > > +    (license license:lgpl3))) > > Looking at > > https://github.com/Nitrokey/libnitrokey/blob/master/NK_C_API.cc, the > > license appears to be LGPL3+, even though the README just says LGPL3. > > Possibly that's only for NK_C_API.cc though (unverified). > I've checked the code and there is only one change in the license recently but the commit itself is little bit misleading as it has different versions in LICENSE and README.md. There is now a ticket with this question. In the meantime I followed the LICENSE file. https://github.com/Nitrokey/libnitrokey/issues/211 > + (snippet '(begin > + (delete-file-recursively "hidapi"))) > Does this have any effect? Looking at > , it looks like 'hidapi' is a > git submodule, which would normally not be included in the checkout > because 'recursive?' has not been found. > If it does have any effect, then wouldn't "tests/catch" in cppcodec > need to be removed as well? You are right, I thought to unbundle just in case all the code but here it's just submodule and it's not cloned. -- Found PkgConfig: /gnu/store/2b3blhwbag1ial0dhxw7wh4zjxl0cqpk-pkg-config-0.29.2/bin/pkg-config (found version "0.29.2") -- Found system Catch2, not using bundled version The Guix libraries are used correctly without any need for manual intervention. > I'm seeing a lot of tests at . You're right. This is my mistake as I only saw the tests that require HW token. Now I've enabled the offline tests. > While the information about being header-only is useful for people > looking to bundle a dependency in their source code, it seems > irrelevant to people using cppcodec via Guix. I've removed this information (FIY I'm C++ programmer so I thought it might be useful :-) Also the tests for ccpcodec are now enabled. The patches in the attachment have been rebase to latest master. ---- Petr From d44b13f8c44491a521bfaa73a414586f6f59ca37 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sat, 5 Feb 2022 23:26:36 +0100 Subject: [PATCH v2 2/3] gnu: Add cppcodec. * gnu/packages/crates-io.scm (cppcodec): New variable. diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 7ea19b13a2..998b9ae36e 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -748,6 +748,30 @@ (define-public libnitrokey (description "This packate provides communication library for Nitrokey.") (license license:lgpl3+))) +(define-public cppcodec + (package + (name "cppcodec") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tplgy/cppcodec") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z39f8w0zvra874az0f67ck1al9kbpaidpilggbl8jnfs05010ck")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags (list "-DBUILD_TESTING=on"))) + (native-inputs (list pkg-config qttools)) + (inputs (list catch-framework2)) + (home-page "https://github.com/tplgy/cppcodec") + (synopsis "Header library to encode/decode base64, base64url, etc.") + (description "This package provides library to encode/decode base64, +base64url, base32, base32hex and hex.") + (license license:expat))) + (define-public nitrocli (package (name "nitrocli") -- 2.34.0