From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 0/2] Add pngquant Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156287666826016 (code B ref -1); Thu, 11 Jul 2019 20:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2019 20:24:28 +0000 Received: from localhost ([127.0.0.1]:38656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfcC-0006lX-2A for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:24:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:39860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfcA-0006lQ-Vz for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:24:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59943) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfcA-0004QX-65 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlfc9-0003Vd-Cj for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:26 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:34672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlfc9-0003To-6f for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6wP3Zv2z1rJgw for ; Thu, 11 Jul 2019 22:24:21 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6wP2lhSz1qqkC for ; Thu, 11 Jul 2019 22:24:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Ot_pD0Sp2Ql2 for ; Thu, 11 Jul 2019 22:24:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Thu, 11 Jul 2019 22:24:20 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 9CB40603AC for ; Thu, 11 Jul 2019 22:24:23 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:24:19 +0200 Message-Id: <20190711202419.5078-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.18.0.9 X-Spam-Score: -2.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: -3.3 (---) Add pngquant and libimagequant required by it. Hartmut Goebel (2): gnu: Add libimagequant. gnu: Add pngquant. gnu/packages/image.scm | 68 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) --=20 2.21.0 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH v4] daemon: Set ownership of kept build directories to the calling user. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287681026267 (code B ref 36605); Thu, 11 Jul 2019 20:27:02 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:26:50 +0000 Received: from localhost ([127.0.0.1]:38662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeT-0006pV-JD for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:49 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:35258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeR-0006pJ-UN for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:48 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zB6BSzz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:46 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zB3JPrz1qqkP for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 6f2Q_1qd0fR2 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:45 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:45 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id BAD77603AC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:09 +0200 Message-Id: <20190711202644.32014-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <58494E16.9010909@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Fixes . * nix/libstore/globals.hh (Settings) Add clientUid and clientGid. * nix/nix-daemon/nix-daemon.cc (daemonLoop] Store UID and GID of the caller in settings. * nix/libstore/build.cc (_chown): New function. (DerivationGoal::deleteTmpDir): Use it, change ownership of build directory if it is kept and the new owner is not root. --- nix/libstore/build.cc | 21 +++++++++++++++++++++ nix/libstore/globals.hh | 6 ++++++ nix/nix-daemon/nix-daemon.cc | 12 ++++++++++++ 3 files changed, 39 insertions(+) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 889ee3d..e823001 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -2631,6 +2631,21 @@ void DerivationGoal::closeLogFile() } +static void _chown(const Path & path, uid_t uid, gid_t gid) +{ + checkInterrupt(); + + if (lchown(path.c_str(), uid, gid) == -1) { + throw SysError(format("change owner and group of `%1%'") % path); + } + struct stat st = lstat(path); + if (S_ISDIR(st.st_mode)) { + for (auto & i : readDirectory(path)) + _chown(path + "/" + i.name, uid, gid); + } +} + + void DerivationGoal::deleteTmpDir(bool force) { if (tmpDir != "") { @@ -2639,6 +2654,12 @@ void DerivationGoal::deleteTmpDir(bool force) format("note: keeping build directory `%2%'") % drvPath % tmpDir); chmod(tmpDir.c_str(), 0755); + // Change the ownership if clientUid is set. Never change the + // ownership or the group to "root" for security reasons. + if (settings.clientUid != (uid_t) -1 && settings.clientUid != 0) { + _chown(tmpDir, settings.clientUid, + settings.clientGid != 0 ? settings.clientGid : -1); + } } else deletePath(tmpDir); diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index 8c07e36..7beb1a5 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh @@ -70,6 +70,12 @@ struct Settings { subgoal of the same goal) fails. */ bool keepGoing; + /* User and groud id of the client issuing the build request. Used to set + the owner and group of the kept temporary directories of failed + builds. */ + uid_t clientUid; + gid_t clientGid; + /* Whether, if we cannot realise the known closure corresponding to a derivation, we should try to normalise the derivation instead. */ diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 682f9a2..47b67d5 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -960,6 +960,18 @@ static void daemonLoop() strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1])); } +#if defined(SO_PEERCRED) + /* Store the client's user and group for this connection. This + has to be done in the forked process since it is per + connection. */ + settings.clientUid = cred.uid; + settings.clientGid = cred.gid; +#else + /* Setting these to -1 means: do not change */ + settings.clientUid = (uid_t) -1; + settings.clientGid = (gid_t) -1; +#endif + /* Handle the connection. */ from.fd = remote; to.fd = remote; -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH] gc: Add option --keep-going. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287681326289 (code B ref 36605); Thu, 11 Jul 2019 20:27:05 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:26:53 +0000 Received: from localhost ([127.0.0.1]:38666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeX-0006pw-0I for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:53 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:57167) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeS-0006pO-Nb for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:49 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zD1zlQz1rYX8 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zD1tJzz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id EVLYyrFq6D_9 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:47 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:46 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id CD331603F4 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:10 +0200 Message-Id: <20190711202644.32014-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * guix/scripts/gc.scm (show-help, %options): Add option -k/--keep-going. (guix-gc): Pass value off option --keep-going on to delete-paths. * guix/store.scm (%protocol-version): Increment to 17. (delete-paths) New key-word parameter `keep-going?`, pass it on to run-rc. (run-gc): New key-word parameter `keep-going?`, send value of keep-going? to the daemon. * nix/libstore/store-api.hh (GCOptions): Add boolean keepGoing. * nix/libstore/worker-protocol.hh (PROTOCOL_VERSION) Increment to 17. * nix/nix-daemon/nix-daemon.cc (performOp)[wopCollectGarbage] Read keepGoing. * nix/libstore/gc.cc (LocalStore::collectGarbage) If keepGoing is true print an error message instead of throwing an error. * doc/guix.texi (Invoking guix gc): Document option --keep-going. --- doc/guix.texi | 8 +++++++- guix/scripts/gc.scm | 9 ++++++++- guix/store.scm | 12 ++++++++---- nix/libstore/gc.cc | 7 ++++++- nix/libstore/store-api.hh | 3 +++ nix/libstore/worker-protocol.hh | 2 +- nix/nix-daemon/nix-daemon.cc | 2 ++ 7 files changed, 35 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a3eba58..b8362d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2098,7 +2098,13 @@ nothing and exit immediately. @itemx -d Attempt to delete all the store files and directories specified as arguments. This fails if some of the files are not in the store, or if -they are still live. +they are still live (with behaviour can be changed with +@option{--keep-going}). + +@item --keep-going +@itemx -k +Keep going when @option{--delete} is given and some of the store files +and directories specified as arguments fail to re removed. @item --list-failures List store items corresponding to cached build failures. diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm index bdfee43..778e9a7 100644 --- a/guix/scripts/gc.scm +++ b/guix/scripts/gc.scm @@ -72,6 +72,9 @@ Invoke the garbage collector.\n")) --clear-failures remove PATHS from the set of cached failures")) (newline) (display (_ " + -k, --keep-going keep going when some of th pathes can not be deleted")) + (newline) + (display (_ " -h, --help display this help and exit")) (display (_ " -V, --version display version information and exit")) @@ -107,6 +110,9 @@ Invoke the garbage collector.\n")) (lambda (opt name arg result) (alist-cons 'action 'delete (alist-delete 'action result)))) + (option '(#\k "keep-going") #f #f + (lambda (opt name arg result) + (alist-cons 'keep-going? #t result))) (option '("optimize") #f #f (lambda (opt name arg result) (alist-cons 'action 'optimize @@ -228,7 +234,8 @@ Invoke the garbage collector.\n")) (let-values (((paths freed) (collect-garbage store))) (info (_ "freed ~h bytes~%") freed)))))) ((delete) - (delete-paths store (map direct-store-path paths))) + (delete-paths store (map direct-store-path paths) + #:keep-going? (assoc-ref opts 'keep-going?))) ((list-references) (list-relatives references)) ((list-requisites) diff --git a/guix/store.scm b/guix/store.scm index 2023875..4276db4 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -137,7 +137,7 @@ direct-store-path log-file)) -(define %protocol-version #x110) +(define %protocol-version #x111) (define %worker-magic-1 #x6e697863) ; "nixc" (define %worker-magic-2 #x6478696f) ; "dxio" @@ -938,7 +938,7 @@ is not an atomic operation.) When CHECK-CONTENTS? is true, check the contents of store items; this can take a lot of time." (not (verify store check-contents? repair?))))) -(define (run-gc server action to-delete min-freed) +(define* (run-gc server action to-delete min-freed #:key (keep-going? #f)) "Perform the garbage-collector operation ACTION, one of the `gc-action' values. When ACTION is `delete-specific', the TO-DELETE is the list of store paths to delete. IGNORE-LIVENESS? should always be @@ -956,6 +956,8 @@ and the number of bytes freed." ;; Obsolete `use-atime' and `max-atime' parameters. (write-int 0 s) (write-int 0 s)) + (when (>= (nix-server-minor-version server) 17) + (write-arg boolean keep-going? s)) ;; Loop until the server is done sending error output. (let loop ((done? (process-stderr server))) @@ -993,12 +995,14 @@ then collect at least MIN-FREED bytes. Return the paths that were collected, and the number of bytes freed." (run-gc server (gc-action delete-dead) '() min-freed)) -(define* (delete-paths server paths #:optional (min-freed (%long-long-max))) +(define* (delete-paths server paths #:optional (min-freed (%long-long-max)) + #:key (keep-going? #f)) "Delete PATHS from the store at SERVER, if they are no longer referenced. If MIN-FREED is non-zero, then stop after at least MIN-FREED bytes have been collected. Return the paths that were collected, and the number of bytes freed." - (run-gc server (gc-action delete-specific) paths min-freed)) + (run-gc server (gc-action delete-specific) paths min-freed + #:keep-going? keep-going?)) (define (import-paths server port) "Import the set of store paths read from PORT into SERVER's store. An error diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index 72eff52..6f2d8f7 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -662,8 +662,13 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) foreach (PathSet::iterator, i, options.pathsToDelete) { assertStorePath(*i); tryToDelete(state, *i); - if (state.dead.find(*i) == state.dead.end()) + if (state.dead.find(*i) == state.dead.end()) { + if (options.keepGoing) { + printMsg(lvlError, format("cannot delete path `%1%' since it is still alive") % *i); + } else { throw Error(format("cannot delete path `%1%' since it is still alive") % *i); + } + } } } else if (options.maxFreed > 0) { diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh index fa78d59..8b0f521 100644 --- a/nix/libstore/store-api.hh +++ b/nix/libstore/store-api.hh @@ -50,6 +50,9 @@ struct GCOptions /* Stop after at least `maxFreed' bytes have been freed. */ unsigned long long maxFreed; + /* keep going even if some of the paths can not be collected */ + bool keepGoing; + GCOptions(); }; diff --git a/nix/libstore/worker-protocol.hh b/nix/libstore/worker-protocol.hh index 99c1ee2..8faf193 100644 --- a/nix/libstore/worker-protocol.hh +++ b/nix/libstore/worker-protocol.hh @@ -6,7 +6,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x110 +#define PROTOCOL_VERSION 0x111 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index a1fce25..b04cece 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -526,6 +526,8 @@ static void performOp(bool trusted, unsigned int clientVersion, readInt(from); readInt(from); } + if (GET_PROTOCOL_MINOR(clientVersion) >= 17) + options.keepGoing = readInt(from) != 0; GCResults results; -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH] gnu: Add anonip. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287681326297 (code B ref 36605); Thu, 11 Jul 2019 20:27:06 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:26:53 +0000 Received: from localhost ([127.0.0.1]:38668 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeX-0006py-F4 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:53 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:45553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeU-0006pc-AH for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:51 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zF67fLz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zF62NHz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 7Ro5qaXOJreO for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id DF80D603FB for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:11 +0200 Message-Id: <20190711202644.32014-3-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/web.scm (anonip): New variable. --- gnu/packages/web.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 124cc93e68..386564206e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -6498,3 +6499,34 @@ update an existing mirrored site, and resume interrupted downloads. HTTrack is fully configurable, and has an integrated help system.") (license license:gpl3+))) + +(define-public anonip + (package + (name "anonip") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "anonip" version)) + (sha256 + (base32 + "0ckn9nnfhpdnz8b92q8pkysdqj6pdh71ckfqvfj0z01cq0hzbhd2")))) + (build-system python-build-system) + (inputs + `(("python-3" ,python-3))) + (home-page + "https://github.com/DigitaleGesellschaft/Anonip") + (synopsis + "Anonymize IP-addresses in log-files") + (description + "Anonip masks the last bits of IPv4 and IPv6 addresses in log-files. +That way most of the relevant information is preserved, while the IP-address +does not match a particular individuum anymore. + +Depending on your webserver software, the log entries may directly get piped +to Anonip or read via a FIFO (named pipe). Thus the unmasked IP addresses +will never be written to any file. + +It's also possible to rewrite existing log files. + +Anonip can also be uses as a Python module in your own Python application.") + (license license:bsd-3))) -- 2.13.7 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH] gnu: Add dtrx. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287682126338 (code B ref 36605); Thu, 11 Jul 2019 20:27:06 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:01 +0000 Received: from localhost ([127.0.0.1]:38672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfea-0006qR-RM for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:00 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:47909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeW-0006pp-53 for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:52 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zH50tSz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:51 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zH4spyz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id lMTQAiglmwxh for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id F13426040A for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:48 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:12 +0200 Message-Id: <20190711202644.32014-4-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/compression.scm (dtrx): New variable. --- gnu/packages/compression.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ae6710b25..0d9a6bfcf 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Petter ;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2018 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,10 +54,12 @@ #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages curl) #:use-module (gnu packages file) #:use-module (gnu packages java) #:use-module (gnu packages maths) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) @@ -2051,3 +2054,50 @@ faster by plzip, unless the @code{-b} option was used: lzip usually produces single-member files which can't be decompressed in parallel.") (license (list license:bsd-2 ; arg_parser.{cc,h} license:gpl2+)))) ; everything else + + +(define-public dtrx + (package + (name "dtrx") + (version "7.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://brettcsmith.org/2007/" + "dtrx/dtrx-" version ".tar.gz")) + (sha256 + (base32 "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2)) + (inputs + `(("binutils" ,binutils) ; ar + ("bzip2" ,bzip2) ; bzcat + ("cabextract" ,cabextract) + ("cpio" ,cpio) ; cpio + ("gzip" ,gzip) ; zcat + ;; ("lha" ,lha) missing in guix + ("p7zip" ,p7zip) ; 7z + ("rpm" ,rpm) ; rpm2cpio + ("tar" ,tar) + ;; ("unrar" ,unrar) ; abandoned upstream + ("unshield" ,unshield) + ("unzip" ,unzip) + ("xz" ,xz))) ; lzcat, xzcat + (home-page "http://www.brettcsmith.org/2007/dtrx/") + (synopsis "Intelligently extract multiple archive types") + (description "@command{dtrx} extracts archives in a number of different +formats, so you don't have to remember the flags for each archive command. +Just use the same command for all your archive files, and they'll never +frustrate you again. + +In addition to providing one command to handle many different archive types, +@command{dtrx} also aids the user by extracting contents consistently. By +default, everything will be written to a dedicated directory that’s named +after the archive. dtrx will also change the permissions to ensure that the +owner can read and write all those files. + +It currently supports tar, zip (including self-extracting .exe files), cpio, +rpm, deb, gem, 7z, cab, rar, and InstallShield files. It can also decompress +files compressed with gzip, bzip2, lzma, xz, or compress.") + (license license:gpl3+))) -- 2.13.6 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH] gnu: Add php-hello-world. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287682126345 (code B ref 36605); Thu, 11 Jul 2019 20:27:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:01 +0000 Received: from localhost ([127.0.0.1]:38676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfef-0006ql-06 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:01 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:38735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeX-0006q3-Sj for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:54 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zK36xKz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:53 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zK31f9z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id YtwtmdkBCUh9 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:52 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:52 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 05A2F60448 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:13 +0200 Message-Id: <20190711202644.32014-5-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/php.scm (php-hello-world): New variable. --- gnu/packages/php.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 9ccbede..f860f88 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:)) ;; This fixes PHP bugs 73155 and 73159. Remove when gd @@ -332,3 +334,38 @@ systems, web content management systems and web frameworks." ) license:lgpl2.1+ ; ext/bcmath/libbcmath license:bsd-2 ; ext/fileinfo/libmagic license:expat)))) ; ext/date/lib + +(define-public php-hello-world + (package + (name "php-hello-world") + (version "0.1") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (php (assoc-ref %build-inputs "php")) + (index.php (string-append out "/index.php"))) + (mkdir-p out) + (call-with-output-file index.php + (lambda (p) + (format p " + PHP test page: Hello, Guix! + + Hello, Guix!'; ?> +

Today is:

+ +~%"))) + (chmod index.php #o555))))) + (inputs + `(("php" ,php))) + (synopsis "Hello, PHP world: An example PHP package") + (description + "PHP Hello World creates a simple HTML page saying \"Hello, Guix!\" and +the current date. It serves as an example to be used in Guix PHP packages or +services.") + (home-page "http://php.net/manual/en/tutorial.firstpage.php") + (license license:gpl3+))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH] gnu: Add python-gunicorn and python2-gunicorn. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287682226363 (code B ref 36605); Thu, 11 Jul 2019 20:27:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:02 +0000 Received: from localhost ([127.0.0.1]:38679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfef-0006qs-HH for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:02 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:49732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeZ-0006qJ-Vw for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:56 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zM3rb1z1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:55 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zM2SM6z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id fiUwt35-h6Iq for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:53 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:53 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 5FB69604B8 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:14 +0200 Message-Id: <20190711202644.32014-6-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/web.scm (python-gunicorn, python2-gunicorn): New variables. --- gnu/packages/web.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 20c7d12..e639d28 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3633,3 +3633,51 @@ provides a unix command line interface to a variety of popular www search engine and similar services.") (home-page "https://surfraw.alioth.debian.org/") (license l:public-domain))) + +(define-public python-gunicorn + (package + (name "python-gunicorn") + (version "19.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gunicorn" version)) + (sha256 + (base32 + "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-requirements + ; setup.py reads test-requirements from a file which is + ; pinning to other versions then guix provides. This also + ; enforces optional packages like pytst-cov. So clean the + ; list. + (lambda _ + (substitute* "requirements_test.txt" + ((".*") ""))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ;("python-pytest-cov" ,python-pytest-cov) ; optional + ("python-setuptools" ,python-setuptools))) + (home-page "http://gunicorn.org/") + (synopsis "Python WSGI HTTP Server for UNIX") + (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP +Server for UNIX. It’s a pre-fork worker model ported from Ruby’s +Unicorn project. The Gunicorn server is broadly compatible with +various web frameworks, simply implemented, light on server resources, +and fairly speedy.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-gunicorn)))))) + +(define-public python2-gunicorn + (let ((base (package-with-python2 + (strip-python2-variant python-gunicorn)))) + ; Note: byte-compiling gunicorn/workers/_gaiohttp.py with Python 2 + ; fails, but this module will be available for Python 3 only + ; anyway. + (package + (inherit base) + (native-inputs `(("python2-mock" ,python2-mock) + ,@(package-native-inputs base)))))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 0/2] Updated patches for gunicorn Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:27:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287682526377 (code B ref 36605); Thu, 11 Jul 2019 20:27:08 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:05 +0000 Received: from localhost ([127.0.0.1]:38681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeg-0006rA-3i for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:02 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:60091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfea-0006qQ-VZ for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:57 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zN3lc9z1rFrd for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:56 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zN3XlCz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id y9ezHqh4kdoe for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:55 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:55 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 7BB77605B0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:15 +0200 Message-Id: <20190711202644.32014-7-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) As discussed, I updated some comments. Additionally I added building teh documentation (2nd patch). Hartmut Goebel (2): gnu: Add gunicorn and gunicorn-python2. gnu: Build documentation for gunicorn and gunicorn-python2. gnu/packages/web.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 1/2] gnu: Add gunicorn and gunicorn-python2. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287682926477 (code B ref 36605); Thu, 11 Jul 2019 20:28:01 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:09 +0000 Received: from localhost ([127.0.0.1]:38688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfej-0006rx-TW for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:09 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:46992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfed-0006qb-52 for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:26:59 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zQ5020z1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:58 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zQ4tg8z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id u9zPhXZiT6oZ for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:57 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:56 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 8E056605BA for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:16 +0200 Message-Id: <20190711202644.32014-8-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/web.scm (gunicorn, gunicorn-python2): New variables. --- gnu/packages/web.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9c201d..3841c6b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur ;;; Copyright © 2016 ng0 +;;; Copyright © 2016 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system r) #:use-module (guix build-system trivial) @@ -3633,3 +3635,56 @@ provides a unix command line interface to a variety of popular www search engine and similar services.") (home-page "https://surfraw.alioth.debian.org/") (license l:public-domain))) + +(define-public gunicorn + (package + (name "gunicorn") + (version "19.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gunicorn" version)) + (sha256 + (base32 + "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-requirements + ; setup.py reads test-requirements from a file which is + ; pinning to other versions then guix provides. This also + ; enforces optional packages like pytst-cov. So clean the + ; list. + (lambda _ + (substitute* "requirements_test.txt" + ((".*") ""))))))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ; optional test-requirement pytest-cov used only when running + ; setup.y with `test --cov` + ("python-pytest" ,python-pytest))) + (home-page "http://gunicorn.org/") + (synopsis "Python WSGI HTTP Server for UNIX") + (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP +Server for UNIX. It’s a pre-fork worker model ported from Ruby’s +Unicorn project. The Gunicorn server is broadly compatible with +various web frameworks, simply implemented, light on server resources, +and fairly speedy.") + (license l:expat) + (properties `((python2-variant . ,(delay gunicorn-python2)))))) + +(define-public gunicorn-python2 + (let ((base (package-with-python2 + (strip-python2-variant gunicorn)))) + ; Note: byte-compiling gunicorn/workers/_gaiohttp.py with Python 2 raises + ; a syntax error, since this is a Python-3-only module. This does not + ; matter since that module is not imported in Python 2 anyway. + (package + (inherit base) + (name "gunicorn-python2") + (description (string-append (package-description base) " + +Use this package if your application is implemented in Python 2.")) + (native-inputs `(("python2-mock" ,python2-mock) + ,@(package-native-inputs base)))))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 2/2] gnu: Build documentation for gunicorn and gunicorn-python2. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683026484 (code B ref 36605); Thu, 11 Jul 2019 20:28:02 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:10 +0000 Received: from localhost ([127.0.0.1]:38697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfen-0006t0-Lp for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:09 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:42246) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfef-0006qj-1C for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:01 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zS486Lz1rYX8 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:00 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zS42r7z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id WyKu7Rsb99W6 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:59 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:59 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A022B605E7 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:17 +0200 Message-Id: <20190711202644.32014-9-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/web.scm (gunicorn): Add build and install documentation (html, info, examples). --- gnu/packages/web.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3841c6b..e04cce0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -3648,6 +3648,7 @@ and similar services.") (base32 "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1")))) (build-system python-build-system) + (outputs '("out" "doc")) (arguments `(#:phases (modify-phases %standard-phases @@ -3658,12 +3659,36 @@ and similar services.") ; list. (lambda _ (substitute* "requirements_test.txt" - ((".*") ""))))))) + ((".*") "")))) + (add-after 'build 'build-doc + (lambda _ + (zero? (system* "make" "-C" "docs" "PAPER=a4" + "html" "info")) + (delete-file "docs/build/texinfo/Makefile") + (delete-file "docs/build/texinfo/Gunicorn.texi"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) + (html (string-append doc "/html")) + (info (string-append doc "/info")) + (examples (string-append doc "/examples"))) + (mkdir-p html) + (mkdir-p info) + (mkdir-p examples) + (copy-recursively "docs/build/html" html) + (copy-recursively "docs/build/texinfo" info) + (copy-recursively "examples" examples) + (for-each (lambda (file) + (copy-file file (string-append doc "/" file))) + '("README.rst" "NOTICE" "LICENSE" "THANKS")))))))) (native-inputs `(("python-setuptools" ,python-setuptools) ; optional test-requirement pytest-cov used only when running ; setup.y with `test --cov` - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx) + ("texinfo" ,texinfo))) (home-page "http://gunicorn.org/") (synopsis "Python WSGI HTTP Server for UNIX") (description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 0/3] Emhancements to the ant-build-system Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683026492 (code B ref 36605); Thu, 11 Jul 2019 20:28:03 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:10 +0000 Received: from localhost ([127.0.0.1]:38699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfen-0006t7-Vi for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:10 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:33046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeg-0006r7-6e for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:04 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zT5Mzyz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:01 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zT5GRVz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id lryhJnJXi5LP for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:01 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:01 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B516F605FB for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:18 +0200 Message-Id: <20190711202644.32014-10-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Enclosed please find two minor enhancments to the ant-build-system and a small clean-up resulting from these. Hartmut Goebel (3): guix: ant-build-system: put dummy project-name into default build.xml. guix: ant-build-system: add empty `tests` target to default build.xml. gnu: Remove now useless #:tests? #f from java-packages. gnu/packages/java.scm | 7 ++----- guix/build/ant-build-system.scm | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 1/3] guix: ant-build-system: put dummy project-name into default build.xml. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683026505 (code B ref 36605); Thu, 11 Jul 2019 20:28:03 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:10 +0000 Received: from localhost ([127.0.0.1]:38702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeo-0006tE-9v for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:10 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:35209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeh-0006rM-Jp for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:05 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zW17Q4z1rYX8 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zW12Njz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id RrjGZ1AfUrL9 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:02 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:02 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id CC97D606A7 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:19 +0200 Message-Id: <20190711202644.32014-11-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Without this, ant reported error messages like Target "tests" does not exist in the project "null". Simple using the jar-name is a good compromise. * guix/build/ant-build-system.scm (default-build.xml): Add attribute to sxml expression. --- guix/build/ant-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 00a4a46..fe7bae5 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -40,7 +40,8 @@ (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".")) + `(project (@ (basedir ".") + (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) (property (@ (name "jar.dir") -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 2/3] guix: ant-build-system: add empty `tests` target to default build.xml. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226520 (code B ref 36605); Thu, 11 Jul 2019 20:28:04 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfep-0006tf-Pe for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:11 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:39504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfej-0006rj-Fg for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:05 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zX1kqZz1rYXJ for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zX1cwCz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id BMJpeHaCWzHh for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:03 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id DDBB2606CD for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:20 +0200 Message-Id: <20190711202644.32014-12-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) This avoids the need to set #:tests? #f whenever using #:jar-name (and thus using the default build.xml). * guix/build/ant-build-system.scm (default-build.xml): Add attribute to sxml expression. --- guix/build/ant-build-system.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index fe7bae5..2cc6bb9 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -70,6 +70,7 @@ (arg (@ (line ,(string-append "-cf ${jar.dir}/" jar-name " -C ${classes.dir} .")))))) + (target (@ (name "tests"))) (target (@ (name "install")) (copy (@ (todir "${dist.dir}")) (fileset (@ (dir "${jar.dir}")) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 3/3] gnu: Remove now useless #:tests? #f from java-packages. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226527 (code B ref 36605); Thu, 11 Jul 2019 20:28:04 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006th-1s for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:12 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfek-0006s5-KO for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:06 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zZ19jQz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zZ15C3z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id rGoBqS8e6NKi for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:04 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id EFF77606D0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:49 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:21 +0200 Message-Id: <20190711202644.32014-13-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) With the last commit, when #:jar-name is given, a dummy test-target always exists. * gnu/packages/java.scm (java-junit, java-swt, java-xz): Remove build-argument `#:tests?'. --- gnu/packages/java.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7387235..e8d09dd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -84,7 +84,6 @@ (build-system ant-build-system) (arguments `(#:jar-name "swt.jar" - #:tests? #f ; no "check" target #:phases (modify-phases %standard-phases (replace 'unpack @@ -1054,8 +1053,7 @@ build process and its dependencies, whereas Make uses Makefile format.") "0x6vn9dp9kxk83x2fp3394n95dk8fx9yg8jns9371iqsn0vy8ih1")))) (build-system ant-build-system) (arguments - `(#:tests? #f ; There are no tests to run. - #:jar-name ,(string-append "xz-" version ".jar") + `(#:jar-name ,(string-append "xz-" version ".jar") #:phases (modify-phases %standard-phases ;; The unpack phase enters the "maven" directory by accident. @@ -1248,8 +1246,7 @@ testing frameworks, mocking libraries and UI validation rules.") #t)))) (build-system ant-build-system) (arguments - `(#:tests? #f ; no tests - #:jar-name "junit.jar")) + `(#:jar-name "junit.jar")) (inputs `(("java-hamcrest-core" ,java-hamcrest-core))) (home-page "http://junit.org/") -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 00/12] Java build-system and some packages Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226533 (code B ref 36605); Thu, 11 Jul 2019 20:28:05 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006to-AD for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:12 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:50808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfel-0006sR-SZ for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:08 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zb349yz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:07 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zb2z71z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id iAlzy6V6yuPR for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:06 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 034AC6071B for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:22 +0200 Message-Id: <20190711202644.32014-14-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Enclosed please find some enhancemnets to the java/ant build-system and some java packages. For the changes to the build-systm I'd apprechiate ideas for better code. There also is room for improovements, e.g. adding both a "test" (unsing junit) and a "javadoc" target to the default build.xml. (I will noit implement this, I'm done with Java). Regarding the packages: Only very few packages have build.xml for ant. For the others I'm only using a default build.xml to get the jar build. So not tests nor javadocs. IMO it is important to have the java packages available at all. After the enhancements described above are implemented, this should be fixed. Hartmut Goebel (12): guix: ant-bulild-sytem: allow specifying the source directory. guix: ant-build-system: use abs path as basedir guix: Add java-utils. gnu: Add java-plexus-utils. gnu: Add java-plexus-interpolation. gnu: Add java-commons-cli. gnu: Add java-commons-codec. gnu: Add java-commons-daemon. gnu: Add java-commons-io. gnu: Add java-commons-lang. gnu: Add java-commons-lang3. gnu: Add java-commons-bcel. Makefile.am | 1 + doc/guix.texi | 3 +- gnu/packages/java.scm | 332 ++++++++++++++++++++++++++++++++++++++++ guix/build-system/ant.scm | 4 + guix/build/ant-build-system.scm | 10 +- guix/build/java-utils.scm | 52 +++++++ 6 files changed, 396 insertions(+), 6 deletions(-) create mode 100644 guix/build/java-utils.scm -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 01/12] guix: ant-bulild-sytem: allow specifying the source directory. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683226542 (code B ref 36605); Thu, 11 Jul 2019 20:28:05 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:12 +0000 Received: from localhost ([127.0.0.1]:38711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006tz-JQ for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:12 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfen-0006sz-UX for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:10 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zd3Mndz1rYX8 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zd3GJvz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id gB6mwbWFGJcR for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:07 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:07 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0A7C360786 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:23 +0200 Message-Id: <20190711202644.32014-15-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * guix/build-system/ant.scm (ant-build) Add parameter src-dir. * guix/build/ant-build-system.scm (default-build.xml): New parameter src-dir. (configure): pass src-dir on to default-build.xml. * doc/guix.texi (Build Systems): Add description. --- doc/guix.texi | 3 ++- guix/build-system/ant.scm | 2 ++ guix/build/ant-build-system.scm | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b6ca34a..19c70ad 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2956,7 +2956,8 @@ parameters, respectively. When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a minimal Ant build file @file{build.xml} with tasks to build the specified jar -archive. +archive. In this case the parameter @code{#:src-dir} can be used to +specify the source sub-directory, defaulting to ``src''. The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase. By default the diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 550f92b..cd544ad 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -98,6 +98,7 @@ (make-flags ''()) (build-target "jar") (jar-name #f) + (src-dir "src") (phases '(@ (guix build ant-build-system) %standard-phases)) (outputs '("out")) @@ -126,6 +127,7 @@ #:test-target ,test-target #:build-target ,build-target #:jar-name ,jar-name + #:src-dir ,src-dir #:phases ,phases #:outputs %outputs #:search-paths ',(map search-path-specification->sexp diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 2cc6bb9..651150d 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,7 +35,7 @@ ;; ;; Code: -(define (default-build.xml jar-name prefix) +(define (default-build.xml src-dir jar-name prefix) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) @@ -59,7 +59,7 @@ (target (@ (name "compile")) (mkdir (@ (dir "${classes.dir}"))) (javac (@ (includeantruntime "false") - (srcdir "src") + (srcdir ,src-dir) (destdir "${classes.dir}") (classpath (@ (refid "classpath")))))) @@ -100,9 +100,9 @@ to the default GNU unpack strategy." ((assq-ref gnu:%standard-phases 'unpack) #:source source))) (define* (configure #:key inputs outputs (jar-name #f) - #:allow-other-keys) + (src-dir "src") #:allow-other-keys) (when jar-name - (default-build.xml jar-name + (default-build.xml src-dir jar-name (string-append (assoc-ref outputs "out") "/share/java"))) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 02/12] guix: ant-build-system: use abs path as basedir Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683326549 (code B ref 36605); Thu, 11 Jul 2019 20:28:06 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:13 +0000 Received: from localhost ([127.0.0.1]:38713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeq-0006u3-T3 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:13 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:49103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfep-0006tX-3R for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:11 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zf4h9Mz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:10 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zf4brVz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id XRDB-hdv12E3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:09 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1CC30607D4 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:24 +0200 Message-Id: <20190711202644.32014-16-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) This allows to chdir into some sub-project prior to building. * guix/build/ant-build-system.scm (default-build.xml): Add parameter. (configure): Pass current directory as base-dir to default-build.xml. --- guix/build/ant-build-system.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm index 651150d..f28182a 100644 --- a/guix/build/ant-build-system.scm +++ b/guix/build/ant-build-system.scm @@ -35,12 +35,12 @@ ;; ;; Code: -(define (default-build.xml src-dir jar-name prefix) +(define (default-build.xml base-dir src-dir jar-name prefix) "Create a simple build.xml with standard targets for Ant." (call-with-output-file "build.xml" (lambda (port) (sxml->xml - `(project (@ (basedir ".") + `(project (@ (basedir ,base-dir) (name ,jar-name)) (property (@ (name "classes.dir") (value "${basedir}/build/classes"))) @@ -102,7 +102,7 @@ to the default GNU unpack strategy." (define* (configure #:key inputs outputs (jar-name #f) (src-dir "src") #:allow-other-keys) (when jar-name - (default-build.xml src-dir jar-name + (default-build.xml (getcwd) src-dir jar-name (string-append (assoc-ref outputs "out") "/share/java"))) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 03/12] guix: Add java-utils. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287683926584 (code B ref 36605); Thu, 11 Jul 2019 20:28:06 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:19 +0000 Received: from localhost ([127.0.0.1]:38718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006ue-6A for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:19 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfer-0006u8-7C for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:13 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zh5SWgz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:12 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zh5Lvwz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id REMXBw8LB2ws for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:11 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:11 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 24921608A5 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:25 +0200 Message-Id: <20190711202644.32014-17-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * guix/build/java-utils.scm: New file. * guix/build-system/ant.scm: Use it. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build-system/ant.scm | 2 ++ guix/build/java-utils.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 guix/build/java-utils.scm diff --git a/Makefile.am b/Makefile.am index 1a34e0d..c711e48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,6 +86,7 @@ MODULES = \ guix/build/emacs-build-system.scm \ guix/build/git.scm \ guix/build/hg.scm \ + guix/build/java-utils.scm \ guix/build/glib-or-gtk-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index cd544ad..b98a651 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -39,6 +39,7 @@ (define %ant-build-system-modules ;; Build-side modules imported by default. `((guix build ant-build-system) + (guix build java-utils) (guix build syscalls) ,@%gnu-build-system-modules)) @@ -107,6 +108,7 @@ (guile #f) (imported-modules %ant-build-system-modules) (modules '((guix build ant-build-system) + (guix build java-utils) (guix build utils)))) "Build SOURCE with INPUTS." (define builder diff --git a/guix/build/java-utils.scm b/guix/build/java-utils.scm new file mode 100644 index 0000000..1ca5b3d --- /dev/null +++ b/guix/build/java-utils.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Hartmut Goebel +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + + +(define-module (guix build java-utils) + #:use-module (guix build utils) + #:export (ant-build-javadoc + install-jars + install-javadoc)) + +(define (package-name-version store-dir) + ; copied from haskell-build-system.scm - seeking for a more general solution + "Given a store directory STORE-DIR return 'name-version' of the package." + (let* ((base (basename store-dir))) + (string-drop base + (+ 1 (string-index base #\-))))) + +(define* (ant-build-javadoc #:key (target "javadoc") (make-flags '()) + #:allow-other-keys) + (zero? (apply system* `("ant" ,target ,@make-flags)))) + +(define* (install-jars jars-dir) + "Helper for the case the build.xml does not include an install target." + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java"))) + (for-each (lambda (f) (install-file f share)) + (find-files jars-dir "\\.jar$"))))) + +(define* (install-javadoc apidocs-dir) + "Helper to install the javadocs." + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (docs (string-append (assoc-ref outputs "doc") + "/share/doc/" (package-name-version out) "/"))) + (mkdir-p docs) + (copy-recursively apidocs-dir docs)))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 04/12] gnu: Add java-plexus-utils. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684026591 (code B ref 36605); Thu, 11 Jul 2019 20:28:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:20 +0000 Received: from localhost ([127.0.0.1]:38720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006ui-IB for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:19 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:48144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfes-0006uM-Ol for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:15 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zk2FTTz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zk284gz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 9kNQVzQzvk5C for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:13 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:13 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 36C9F608B5 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:26 +0200 Message-Id: <20190711202644.32014-18-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (codehaus-plexus-url): New function. (java-plexus-utils): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e8d09dd..0dfd9fa 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1256,3 +1256,35 @@ testing frameworks, mocking libraries and UI validation rules.") JUnit provides assertions for testing expected results, test fixtures for sharing common test data, and test runners for running tests.") (license license:epl1.0))) + +; +; codehaus plexus +; + +(define* (codehaus-plexus-url projname version) + (let ((projname (string-append "plexus-" projname))) + (string-append "https://github.com/codehaus-plexus/" projname + "/archive/" projname "-" version ".tar.gz"))) + +(define-public java-plexus-utils + (package + (name "java-plexus-utils") + (version "3.0.24") + (source (origin + (method url-fetch) + (uri (codehaus-plexus-url "utils" version)) + (sha256 + (base32 "1mlwpc6fms24slygv5yvi6fi9hcha2fh0v73p5znpi78bg36i2js")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + `(#:tests? #f ; todo: tests + #:jar-name (string-append "plexus-utils-" ,version ".jar") + #:src-dir "src/main")) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://codehaus-plexus.github.io/plexus-utils/") + (synopsis "Common utilities for the Plexus framework") + (description "Various Java utility classes to ease working with strings, +files, command lines, XML and more.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 05/12] gnu: Add java-plexus-interpolation. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684026602 (code B ref 36605); Thu, 11 Jul 2019 20:28:07 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:20 +0000 Received: from localhost ([127.0.0.1]:38723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006uq-VJ for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:20 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:49060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfeu-0006uW-Gi for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:16 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zm0SWGz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zm0MGFz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id xyTWslXiZQho for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:14 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 438AC608C9 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:27 +0200 Message-Id: <20190711202644.32014-19-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-plexus-interplation): New variable. --- gnu/packages/java.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 0dfd9fa..3687c7e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1288,3 +1288,31 @@ sharing common test data, and test runners for running tests.") (description "Various Java utility classes to ease working with strings, files, command lines, XML and more.") (license license:asl2.0))) + +(define-public java-plexus-interpolation + (package + (name "java-plexus-interpolation") + (version "1.23") + (source (origin + (method url-fetch) + (uri (codehaus-plexus-url "interpolation" version)) + (sha256 (base32 "1w79ljwk42ymrgy8kqxq4l82pgdj6287gabpfnpkyzbrnclsnfrp")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + `(#:tests? #f ; todo: tests + #:jar-name (string-append "plexus-interpolation-" ,version ".jar") + #:src-dir "src/main")) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://codehaus-plexus.github.io/plexus-interpolation/") + (synopsis "Java components for interpolating ${} strings and the like") + (description "Plexus interpolator is the outgrowth of multiple iterations +of development focused on providing a more modular, flexible interpolation +framework for the expression language style commonly seen in Maven, Plexus, +and other related projects. + +It has its foundation in the org.codehaus.plexus.utils.interpolation package +within plexus-utils, but has been separated in order to allow these two +libraries to vary independently of one another.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 06/12] gnu: Add java-commons-cli. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684326627 (code B ref 36605); Thu, 11 Jul 2019 20:28:08 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:23 +0000 Received: from localhost ([127.0.0.1]:38727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vJ-Eg for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:55490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfex-0006uf-Gh for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:20 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zq0TGZz1rB8y for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zq0P5Mz1qqkM for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id c0lfXCbMbOZV for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:16 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 4AFCA608D2 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:28 +0200 Message-Id: <20190711202644.32014-20-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (appache-commons-url): New function. (java-commons-cli): New variable. --- gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3687c7e..a83423d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1316,3 +1316,51 @@ It has its foundation in the org.codehaus.plexus.utils.interpolation package within plexus-utils, but has been separated in order to allow these two libraries to vary independently of one another.") (license license:asl2.0))) + +; +; apache commons +; + +(define* (apache-commons-url projname version + #:optional (basename + (string-append "commons-" projname))) + (string-append "mirror://apache/commons/" projname "/source/" + basename "-" version "-src.tar.gz")) + +(define-public java-commons-cli + (package + (name "java-commons-cli") + (version "1.3.1") + (source (origin + (method url-fetch) + (uri (apache-commons-url "cli" version)) + (sha256 (base32 "1fkjn552i12vp3xxk21ws4p70fi0lyjm004vzxsdaz7gdpgyxxyl")))) + (build-system ant-build-system) + ; todo: javadoc + (arguments + ; commons-cli does not provida a proper build.xml but seems to require + ; maven for building + `(#:jar-name (string-append "commons-cli-" ,version ".jar") + #:phases + (modify-phases %standard-phases + (delete 'check)))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/cli/") + (synopsis "Command line arguments and options parsing library") + (description "The Apache Commons CLI library provides an API for parsing +command line options passed to programs. It's also able to print help messages +detailing the options available for a command line tool. + +Commons CLI supports different types of options: + +@itemize +@item POSIX like options (ie. tar -zxvf foo.tar.gz) +@item GNU like long options (ie. du --human-readable --max-depth=1) +@item Java like properties (ie. java -Djava.awt.headless=true Foo) +@item Short options with value attached (ie. gcc -O2 foo.c) +@item long options with single hyphen (ie. ant -projecthelp) +@end itemize + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 07/12] gnu: Add java-commons-codec. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684426634 (code B ref 36605); Thu, 11 Jul 2019 20:28:08 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:24 +0000 Received: from localhost ([127.0.0.1]:38729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vR-OL for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:48764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfez-0006v8-C2 for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:21 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zr6XsZz1rHD6 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zr6SHKz1qqkM for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id oUxC2wRp0pvW for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:19 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 62C23608F0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:29 +0200 Message-Id: <20190711202644.32014-21-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-codec): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a83423d..a5d3a25 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1364,3 +1364,35 @@ Commons CLI supports different types of options: This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-codec + (package + (name "java-commons-codec") + (version "1.10") + (source (origin + (method url-fetch) + (uri (apache-commons-url "codec" version)) + (sha256 (base32 "1w9qg30y4s0x8gnmr2fgj4lyplfn788jqxbcz27lf5kbr6n8xr65")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + ; commons-cli does not provida a proper build.xml but seems to require + ; maven for building + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'check) ; todo: need to pass junit to classpath + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "dist")) + (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/codec/") + (synopsis "Common encoders and decoders such as Base64, Hex, Phonetic and URLs") + (description "The codec package contains simple encoder and decoders for +various formats such as Base64 and Hexadecimal. In addition to these widely +used encoders and decoders, the codec package also maintains a collection of +phonetic encoding utilities. + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 08/12] gnu: Add java-commons-daemon. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684726652 (code B ref 36605); Thu, 11 Jul 2019 20:28:09 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:27 +0000 Received: from localhost ([127.0.0.1]:38732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff5-0006vm-0k for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:48822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff1-0006vI-6I for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:23 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zt5FlNz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:22 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zt58Wcz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ivbg1iEcmTwS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:21 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:21 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 7510F608FD for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:30 +0200 Message-Id: <20190711202644.32014-22-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-daemon): New variable. --- gnu/packages/java.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a5d3a25..e200296 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1396,3 +1396,35 @@ phonetic encoding utilities. This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-daemon ; build, todo: verify results + (package (name "java-commons-daemon") + (version "1.0.15") + (source (origin + (method url-fetch) + (uri (apache-commons-url "daemon" version)) + (sha256 + (base32 "0ci46kq8jpz084ccwq0mmkahcgsmh20ziclp2jf5i0djqv95gvhi")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "dist")) + (add-after 'install 'install-doc (install-javadoc "dist/docs/api"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/daemon/") + (synopsis "Library to launch Java applications as daemons") + (description "The Daemon package from Apache Commons can be used to +implement Java applications which can be launched as daemons. For example the +program will be notified about a shutdown so that it can perform cleanup tasks +before its process of execution is destroyed by the operation system. + +This package contains the java library. You will also need the actual binary +for your architecture which is provided by the jsvc package. + +This is a part of the Apache Commons Project.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 09/12] gnu: Add java-commons-io. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287684726663 (code B ref 36605); Thu, 11 Jul 2019 20:28:09 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:27 +0000 Received: from localhost ([127.0.0.1]:38735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff5-0006vp-CL for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:36677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff2-0006vd-Ub for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zw3VDQz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zw3Nyvz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id WytD8MddE9Ya for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:23 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:23 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 90DE86091E for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:31 +0200 Message-Id: <20190711202644.32014-23-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-io): New variable. --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e200296..3af8cd0 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1428,3 +1428,45 @@ for your architecture which is provided by the jsvc package. This is a part of the Apache Commons Project.") (license license:asl2.0))) + +(define-public java-commons-io + (package + (name "java-commons-io") + (version "2.5") + (source (origin + (method url-fetch) + (uri (apache-commons-url "io" version)) + (sha256 (base32 "0q5y41jrcjvx9hzs47x5kdhnasdy6rm4bzqd2jxl02w717m7a7v3")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'symlink-junit.jar + (lambda* (#:key source #:allow-other-keys) + ; the existance of this file is taken as indicator whether test + ; dependencis will to be downloaded. + (let ((junit (assoc-ref inputs "java-junit")) + (junit-version "4.12")) ; from build.xml + (mkdir-p "lib") + (symlink (string-append junit "/share/java/junit.jar") + (string-append "lib/junit-" junit-version ".jar"))))) + (add-after 'build 'build-javadoc ant-build-javadoc) + (add-after 'configure 'patch-build.xml + (lambda* _ + (substitute* "build.xml" + ; set current year to a fixed value, you may want to update + ; this when updating the package version + (("]+>") + "")))) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + (native-inputs + `(("java-junit" ,java-junit) + ("java-hamcrest-core" ,java-hamcrest-core))) + (home-page "http://commons.apache.org/io/") + (synopsis "Common useful IO related classes") + (description "Commons-IO contains utility classes, stream implementations, +file filters and endian classes.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 10/12] gnu: Add java-commons-lang. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685126688 (code B ref 36605); Thu, 11 Jul 2019 20:28:10 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:31 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff8-0006wG-OZ for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:31 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff4-0006vl-QW for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:27 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6zy2bKqz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6zy2Rx0z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Yq4cYM2CWXOl for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:24 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A311960938 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:32 +0200 Message-Id: <20190711202644.32014-24-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-lang): New variables. --- gnu/packages/java.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3af8cd0..5a90d05 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1470,3 +1470,51 @@ This is a part of the Apache Commons Project.") (description "Commons-IO contains utility classes, stream implementations, file filters and endian classes.") (license license:asl2.0))) + +(define-public java-commons-lang + (package + (name "java-commons-lang") + (version "2.6") + (source (origin + (method url-fetch) + (uri (apache-commons-url "lang" version)) + (sha256 (base32 "1mxwagqadzx1b2al7i0z1v0r235aj2njdyijf02szq0vhmqrfiq5")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (add-before 'check 'fix-test-framework + (lambda _ + ;; disable a failing test + (substitute* "src/test/java/org/apache/commons/lang/time/FastDateFormatTest.java" + (("public void testFormat\\(\\)") + "public void disabled_testFormat()")) + #t)) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "http://commons.apache.org/lang/") + (synopsis "Extension of the java.lang package") + (description "The Commons Lang components contains a set of Java classes +that provide helper methods for standard Java classes, especially those found +in the java.lang package in the Sun JDK. The following classes are included: + + * StringUtils - Helper for java.lang.String. + * CharSetUtils - Methods for dealing with CharSets, which are sets of + characters such as [a-z] and [abcdez]. + * RandomStringUtils - Helper for creating randomised Strings. + * NumberUtils - Helper for java.lang.Number and its subclasses. + * NumberRange - A range of numbers with an upper and lower bound. + * ObjectUtils - Helper for java.lang.Object. + * SerializationUtils - Helper for serializing Objects. + * SystemUtils - Utility class defining the Java system properties. + * NestedException package - A sub-package for the creation of nested + exceptions. + * Enum package - A sub-package for the creation of enumerated types. + * Builder package - A sub-package for the creation of equals, hashCode, + compareTo and toString methods.") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 11/12] gnu: Add java-commons-lang3. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685126695 (code B ref 36605); Thu, 11 Jul 2019 20:28:10 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:31 +0000 Received: from localhost ([127.0.0.1]:38741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff9-0006wP-2W for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:31 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:37486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff6-0006w6-Lg for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:29 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7001YfWz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7001SMsz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ADFm6uAr4-_O for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:26 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id B557960974 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:33 +0200 Message-Id: <20190711202644.32014-25-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-lang3): New variable. --- gnu/packages/java.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 5a90d05..b7971a3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1518,3 +1518,55 @@ in the java.lang package in the Sun JDK. The following classes are included: * Builder package - A sub-package for the creation of equals, hashCode, compareTo and toString methods.") (license license:asl2.0))) + +(define-public java-commons-lang3 + (package + (name "java-commons-lang3") + (version "3.4") + (source (origin + (method url-fetch) + (uri (apache-commons-url "lang" version "commons-lang3")) + (sha256 + (base32 "0xpshb9spjhplq5a7mr0y1bgfw8190ik4xj8f569xidfcki1d6kg")))) + (build-system ant-build-system) + (outputs '("out" "doc")) + (arguments + `(#:tests? #f + #:test-target "test" ; requirements are missing, see below + #:phases + (modify-phases %standard-phases + (add-after 'build 'build-javadoc ant-build-javadoc) + (replace 'install (install-jars "target")) + (add-after 'install 'install-doc (install-javadoc "target/apidocs"))))) + ;(native-inputs + ; `(("java-junit" ,java-junit))) + ; todo: tests. Requier hamcrest, commons-io, easymock. jar paths need to + ; be written into a properties files. See buld.xml in the source. + (home-page "http://commons.apache.org/lang/") + (synopsis "Extension of the java.lang package (for Java 5+)") + (description "The Commons Lang components contains a set of Java classes +that provide helper methods for standard Java classes, especially those found +in the java.lang package in the JDK 5+. The following classes are included: + + * StringUtils - Helper for java.lang.String. + * CharSetUtils - Methods for dealing with CharSets, which are sets of + characters such as [a-z] and [abcdez]. + * RandomStringUtils - Helper for creating randomised Strings. + * NumberUtils - Helper for java.lang.Number and its subclasses. + * NumberRange - A range of numbers with an upper and lower bound. + * ObjectUtils - Helper for java.lang.Object. + * SerializationUtils - Helper for serializing Objects. + * SystemUtils - Utility class defining the Java system properties. + * NestedException package - A sub-package for the creation of nested + exceptions. + * Enum package - A sub-package for the creation of enumerated types. + * Builder package - A sub-package for the creation of equals, hashCode, + compareTo and toString methods. + +Commons Lang 3.x use a different package (org.apache.commons.lang3) than the +previous versions (Commonas Lang 1.x and 2.x, which use +org.apache.commons.lang), allowing it to be used at the same time as an +earlier version. + +Commons Lang 3.x is only compatible with JDK 1.5+ ") + (license license:asl2.0))) -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 12/12] gnu: Add java-commons-bcel. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685526719 (code B ref 36605); Thu, 11 Jul 2019 20:28:11 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:35 +0000 Received: from localhost ([127.0.0.1]:38745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffC-0006ws-J0 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:34 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:52454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff8-0006wE-GJ for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:30 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7020LjRz1rJCN for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7020FSBz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id VG6UvxUCOV61 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:28 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id C7EE0603AC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:34 +0200 Message-Id: <20190711202644.32014-26-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/packages/java.scm (java-commons-bcel): New variable. --- gnu/packages/java.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b7971a3..b1e1ecc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1327,6 +1327,24 @@ libraries to vary independently of one another.") (string-append "mirror://apache/commons/" projname "/source/" basename "-" version "-src.tar.gz")) +(define-public java-commons-bcel + (package + (name "java-commons-bcel") + (version "6.0") + (source (origin + (method url-fetch) + (uri (apache-commons-url "bcel" version "bcel")) + (sha256 (base32 "0n39601zcj7ymjihfv53r260mf3n8kj6bqhxv90dw5sgc7qbjqxr")))) + (build-system ant-build-system) + ; todo: tests, javadoc + (arguments + `(#:jar-name (string-append "commons-bcel-" ,version ".jar") + #:src-dir "src/main")) + (home-page "http://commons.apache.org/bcel/") + (synopsis "Apache Commons Bytecode Engineering Library") + (description "") + (license license:asl2.0))) + (define-public java-commons-cli (package (name "java-commons-cli") -- 2.7.4 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 1/6] gnu: kcoreaddons: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685526732 (code B ref 36605); Thu, 11 Jul 2019 20:28:11 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:35 +0000 Received: from localhost ([127.0.0.1]:38748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffC-0006wu-U6 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:35 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:40506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlff9-0006wV-M6 for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:32 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7031fYsz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:31 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7031XKNz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:31 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id NTKEjyJuEMMi for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:30 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id DF3A1609D2 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:35 +0200 Message-Id: <20190711202644.32014-27-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Enable running the tests and blacklist the one failing test. * gnu/package/kde-frameworks.scm(kcoreaddons)[arguments] <#:tests?>: Remove. <#:phases>: Add phase 'blacklist-failing-test. --- gnu/packages/kde-frameworks.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5ab97c0b0..35e10015e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -566,9 +566,16 @@ propagate their changes to their respective configuration files.") (inputs `(("qtbase" ,qtbase))) (arguments - `(#:tests? #f ; FIXME: Test failure caused by stout/stderr being interleaved. - #:phases + `(#:phases (modify-phases %standard-phases + (add-before 'check 'blacklist-failing-test + (lambda _ + ;; Blacklist a failing test-function. FIXME: Make it pass. + ;; Test failure caused by stout/stderr being interleaved. + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (display "[test_channels]\n*\n"))) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.13.7 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 2/6] gnu: kirigami: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287685826749 (code B ref 36605); Thu, 11 Jul 2019 20:28:11 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:38 +0000 Received: from localhost ([127.0.0.1]:38751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffG-0006xL-Dm for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:38 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:37452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffB-0006wk-Ba for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:34 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7046RLSz1rJCN for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:32 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7046M2dz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id WGxzKQlKtyu6 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:31 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:31 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id F1712609E6 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:50 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:36 +0200 Message-Id: <20190711202644.32014-28-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) The error which inhibited running the tests no longer occurs in 5.49.0, although now no tests are found at all. Since no tests are found now, the phase 'check-setup can be removed, too, and thus the 'arguments' at all. * gnu/packages/kde-frameworks.scm(kirigami)[arguments]: Remove. --- gnu/packages/kde-frameworks.scm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 35e10015e..62cf49c57 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -804,19 +804,6 @@ or user activity.") ("qtsvg" ,qtsvg) ;; Run-time dependency ("qtgraphicaleffects" ,qtgraphicaleffects))) - (arguments - `(#:tests? #f ;; FIXME: Test suite is broken, - ;; see https://bugs.kde.org/show_bug.cgi?id=386456 - ;; Note for when enabling the tests: The test-suite is meant to be run - ;; without prior installation, see - ;; https://cgit.kde.org/kirigami.git/commit/?id=24ad2c9 - #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* (#:key outputs #:allow-other-keys) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuick components for mobile user interfaces") (description "Kirigami is a set of high level QtQuick components looking -- 2.13.7 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 3/6] gnu: kpackage: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287686126758 (code B ref 36605); Thu, 11 Jul 2019 20:28:12 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:41 +0000 Received: from localhost ([127.0.0.1]:38753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffG-0006xO-Ol for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:39 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:42836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffC-0006wr-HT for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:35 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7060dnpz1rYX3 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:34 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7060X63z1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:34 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Vc2LmnTplhN0 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:33 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:33 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 04B7B609FF for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:51 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:37 +0200 Message-Id: <20190711202644.32014-29-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) * gnu/package/kde-frameworks.scm(kpackage)[arguments] <#:tests?>: Remove. <#:phases>: Add phase 'patch-tests. --- gnu/packages/kde-frameworks.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 62cf49c57..07e30d4cf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1834,8 +1834,7 @@ covers feedback and persistent events.") ("ki18n" ,ki18n) ("qtbase" ,qtbase))) (arguments - `(#:tests? #f ; FIXME: 3/9 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ @@ -1847,6 +1846,17 @@ covers feedback and persistent events.") (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b))) #t)) + (add-after 'unpack 'patch-tests + (lambda _ + ;; /bin/ls doesn't exist in the build-container use /etc/passwd + (substitute* "autotests/packagestructuretest.cpp" + (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\"" + _ a b c) + (string-append a "etc" b "etc" c "etc\"")) + (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))") + "filePath(\"etc\", QStringLiteral(\"passwd\"))") + (("\"/bin/ls\"") "\"/etc/passwd\"")) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd)) -- 2.13.7 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 4/6] gnu: kemoticons: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:28:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287686126765 (code B ref 36605); Thu, 11 Jul 2019 20:28:12 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:27:41 +0000 Received: from localhost ([127.0.0.1]:38755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffJ-0006xX-H1 for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:41 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:42241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlffD-0006xD-TQ for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:27:36 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7073F53z1rJCN for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:35 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l70738mJz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:35 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id yrY7zb98cjjg for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:34 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:27:34 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0D3BE60A14 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:51 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:38 +0200 Message-Id: <20190711202644.32014-30-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Without anything changed the test-suite now passes, thus can be enabled. * gnu/package/kde-frameworks.scm(kemoticons)[arguments]<#:tests?>: Remove. --- gnu/packages/kde-frameworks.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 07e30d4cf..079a8a75e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2423,8 +2423,7 @@ engine WebKit via QtWebKit.") ("kcoreaddons" ,kcoreaddons) ("qtbase" ,qtbase))) (arguments - `(#:tests? #f ; FIXME: 2/2 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ -- 2.13.7 From unknown Mon Aug 11 19:03:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#36605] [PATCH 5/6] gnu: knewstuff: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2019 20:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36605 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36605@debbugs.gnu.org Received: via spool by 36605-submit@debbugs.gnu.org id=B36605.156287738227902 (code B ref 36605); Thu, 11 Jul 2019 20:37:03 +0000 Received: (at 36605) by debbugs.gnu.org; 11 Jul 2019 20:36:22 +0000 Received: from localhost ([127.0.0.1]:38801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfnh-0007Fy-Vf for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:36:22 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:47888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfng-0007Fo-Dx for 36605@debbugs.gnu.org; Thu, 11 Jul 2019 16:36:20 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7BC3Yzqz1rJh4 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:19 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7BC3Tcsz1qqkC for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id OdkXt2kEEai5 for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:17 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:17 +0200 (CEST) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1EA6C60A1A for <36605@debbugs.gnu.org>; Thu, 11 Jul 2019 22:26:51 +0200 (CEST) From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:39 +0200 Message-Id: <20190711202644.32014-31-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) 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.7 (-) Without anything changed the test-suite now passes, thus can be enabled. * gnu/package/kde-frameworks.scm(knewstuff)[arguments]<#:tests?>: Remove. --- gnu/packages/kde-frameworks.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 079a8a75e..45580cb5f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2727,8 +2727,7 @@ KIO enabled infrastructure.") ("solid" ,solid) ("sonnet" ,sonnet))) (arguments - `(#:tests? #f ; FIXME: 1/3 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ ; XDG_DATA_DIRS isn't set -- 2.13.7 From unknown Mon Aug 11 19:03:54 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: Hartmut Goebel Subject: bug#36605: closed (Did send wrong patches) Message-ID: References: <20190711202419.5078-1-h.goebel@crazy-compilers.com> X-Gnu-PR-Message: they-closed 36605 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 36605@debbugs.gnu.org Date: Thu, 11 Jul 2019 20:37:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1562877424-28004-1" This is a multi-part message in MIME format... ------------=_1562877424-28004-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #36605: [PATCH 0/2] Add pngquant 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 36605@debbugs.gnu.org. --=20 36605: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D36605 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1562877424-28004-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 36605-close) by debbugs.gnu.org; 11 Jul 2019 20:36:24 +0000 Received: from localhost ([127.0.0.1]:38803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfnk-0007GE-6o for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:36:24 -0400 Received: from mail-out.m-online.net ([212.18.0.10]:45166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfnh-0007Fv-Hd for 36605-close@debbugs.gnu.org; Thu, 11 Jul 2019 16:36:22 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l7BD6JWBz1rYXY for <36605-close@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:20 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l7BD6BN6z1qqkC for <36605-close@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id UQGZkWDDjm_p for <36605-close@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <36605-close@debbugs.gnu.org>; Thu, 11 Jul 2019 22:36:20 +0200 (CEST) Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 038EF6015D for <36605-close@debbugs.gnu.org>; Thu, 11 Jul 2019 22:28:06 +0200 (CEST) To: 36605-close@debbugs.gnu.org From: Hartmut Goebel Subject: Did send wrong patches Openpgp: preference=signencrypt Organization: Goebel Consult Message-ID: Date: Thu, 11 Jul 2019 22:28:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1FFF5D9C7EBA6BACBF804268" Content-Language: de-DE X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 36605-close 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.7 (-) This is a multi-part message in MIME format. --------------1FFF5D9C7EBA6BACBF804268 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Did send wrong patches --------------1FFF5D9C7EBA6BACBF804268 Content-Type: application/pgp-keys; name="0x7B752811BF773B65.asc" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0x7B752811BF773B65.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- mQINBFJQM3oBEACiUXmMppc3+A7JpF3lPz8O/mRhfz1U6F4EOTlacTrCcm7Xg5U2 JsPPNapVr5+vHnKBK+xbaX3s/A/G+SwrUZhi1X1HRnSNY1CqL8CT7rZmOtfjg4Ex nOuCjie2bKhb9JKmlJ7MrNimIbNQoX1mRcQ4VMEflhyWfaPGbT73siuMkbr020Ex hzW8T18JIC01SgWMULYMBXOBoGY21am/vaTFCK8bym1P4HVN8i64uOWL0agkAMHb ju6SZtG2fYJ68eS3P/97bXRg1pveEdpaFgaFZhquecw4WdedwLwt1xNcjAg/p6tN 73W3asEZTgMHa+iNzbJgcyhWpci09wQZfZ1uL0HdM+ohng38ccgu9hJx6YzCN7Fe 14JooKbPukG/WfClAgAzZSHRKpS4zGdGlg6D6EWayyWWoLR3KoMA4LIIlaQbqaOh fe85b4mNgB1hqd0uRTHOah/6T+FUoSQ1IAeKLIDqj6rW7X4ISRn1CXGSLGDn2QKq R3KtU3cLf8hAeDeO7Qe1jTvLrG1Mfca8lEmC7/yN1gI7L4/cs6lhmXUgMaevuxss BxO2kkh0OS8HVFf+QQ7LZ5vt91yQVT9HVvOuVob0YtG+3rvkpMaHQilKloNoEkmM iHpwypBaIfAC6NP9smgionvvmQ5RWSEaH5/pfSUAYbqzWbqDxtqEF/mPOwARAQAB tCtIYXJ0bXV0IEdvZWJlbCA8aC5nb2ViZWxAZ29lYmVsLWNvbnN1bHQuZGU+iQJA BBMBCgAqAhsDAh4BAheAAhkBBQsJCAcDBRUKCQgLBRYCAwEABQJbsiuQBQkNJF8R AAoJEHt1KBG/dztliyIQAJk8ChpVHWdcp2DJ6sk4iijpFEBWBz8EM3Tis39hF0eh dXBT1O1Q77koN6Ws2wymc5OQj1cDUmMbPKVMyR0sagytvMQUHM4tlIJPcOXqOO11 eMUA5yJZm6bdY6CAxkF5Eh5NB492lCkmVyOU3FR5AbUtXheFezi2mKn4yr/elSca VOxQrMcKqr5OYLGqAtiPizeskOUKBcQfShwU4IDWroC0TFlviI1ZMuwDnesOic7O 1cNvhq8fgVr0X8X2iRwOQT53701JDM83Aeeyh3KxsL3BlHAvY+BevMU8p37ZvXrf EQkJJcOabnW1FuttrgN7QEMnSIgyJ21CGTS4IxPoCF193fMiJMY+HjacAGdO/Iia FfgtyKCbpduPajd/Pi+XkdNkqI9BcRNVbQnknqtN2kYWbE0qld3N3mPvCXPUZASW MuTypLgLQoMotDUJlBTct1NqozYK5VXuF+GncnC+A141DIpk8N3LGr9dEJaouVgn 34hEviNlHhPxzQasgf8zeko/JY3MTgzpMPtjQuoCNo4dbeHHteaeBV1UaJmT2wUX 0KoFyBS1iu9fBftHVNuyBdHN8eUokuM/2n676m1tdWvM76Jstnru+w67vUTHPVCR +gEtPc4FV6MqCiRN/4nc3KTcURnhkQzdLEXDlFfOpw4o0JYB/lCzFHkFLR6QbZ66 iQI+BBMBAgAoBQJSUDN6AhsDBQkFo5qABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX gAAKCRB7dSgRv3c7ZbfPEACRmUAnpD8NAA1z/BT1yPNqeX8dSHG4s9pbJQKmxLes 4VxI66LrrN9nktdHocreW8zKdQOAtMSIWtHSdINxrRuA4d3PoJ7hBloKRhRs1Dfg m7MqBTTOS8BpGXVu5XDT4QihanoI3/5pgYb06DKedjSnUbxLUEBirkqCfknOZWmx C6/TkAWWFSu3XIOwGxefG+85klibAW/3j9AB1UWQamM2dQ70FOCWurQ+uzaThjJ2 k+PBUWgHuujaPE5plArbLXd5JJVS1RihnsW0UzVm1FWADMDlr9tgG5hPiTPHPOa+ wba9BWih1BT0FBIEOuB2/yxTTFQ27QnpiOAXQjWubzPnjKqhs/GWvTJY3q9k3lst 5lVoa+xg/Avc4NKbwawCZ3bG8A0j3Wt44j/JErKCMCxIp4YYJtx8eb6Jud8lGr1g jTwdtmhd3mswfakmqcMTOout1cCiGlfDW3bXwd7s/9WZyyUoNsk4whiOEO55Diyd l+JVJB9pXOmE3X2sutxTj7TAoqb8m/y21XRDslzL2E6C82+UGvwN/tcC8B1k5y+w BTtULPyhMyk9jayS4Y8Shm9JA7sc/7YH63jgzBbjW1RjDLXJ1GiOoaO5wXZFrBzT WsmvP30qZ0+vjQnT2Ba/hz9QmS40j41P9KzUoThjbfpUFWt1pXR+LzsvLIc/XSV9 N4kCHAQQAQIABgUCU1wGGgAKCRAVIu2Z2EUnndSDEACuqXngMO4A4NlnkFjnTYfD 5Q9/pdqRmezISzwHKF3aoudGedtstZVE54Bs+9q84JeQDRt6HLSeB7Fg+0IWkALl mfqwvIP/1kL9nIwd6jJ/NsO2/ehYAbmKObIafSHM00hVSe7ETDpTUx+HOa19AkOL VxhxuQDgN5St/vImWQFJh2kK9B/RGAgxAudtWKJHGfSg85eg2gmyn2rTmdDJAErn 2UWy98jzFp1SzuyEjadNcMcwRCkEQhAlv2ZRqUJWzxC8IQ3nNj2ci0e+M4ge3BwC Onbt/F26i8iksn0X6tLB+PhRiyJ7Cdbts/QKVo4PHT2AFx2n2/jiIdgkQbX8SIU1 nlY507QV+mnhWC4ESSXuptlpd2jej0k3M4iLEV68pl1vwiAjgTHhNaLz3odQkdC5 NqMaFVYd3eSwLXV/gaYq53SL+W3FXVF7PI9hwqfggyHCyEATH3vf4l584Oj54Ci2 7isbz+7aqBgKMaRJmtvm0yH8zJh9yGjOQIjzJImGNjGcCUMLkTXDKF3OyJawCGn1 JSlDkuWoDOPaTYLjQ5vEEkpAl2pLq6gtSFP66nzObHthRpPAFTPEbqsuVx1iZFQC hFDQ9J9L2wWcoVAe9/0L5m4awWyjtSdyP+0wb+gIIvgAq1KwDsh2uzI+EZyKDoDi jAKPdBdRYWQMgv+7oZ9OzYheBBARCAAGBQJSn6+xAAoJELfvYUaKFOZUUMsA/2vu lFb7bJAWcZpILzNW8lu6gT4s+U3MG7hjVEureJuKAP4sqDZYRmtUuEfKjTsLBLmV LBMjYk/tTKksMiajHxiDKokCHAQTAQIABgUCVOuE+QAKCRDrmXakz6NJM5OPEACo EllO40HpT/H/szbLvZzFiY9BhH8T6dHYh0ICjRkziit/fs3mLAzrFcciSYU//Gwt U6TWV2v+lTqyCkdapEhTZ/S3cbhvwEFXEf4AlZiE2oIhEPGOecrjk0JNhHmpKi09 O4RKdCETAW7ejhuzksWxj3BP1iIOeuWcpIsOAlF2Qo3ejfE+LQGRy6nEnBFS2+WE 3jQ2jRv+I9VUX97oiTwKF3bpQVWAeXSsqE3bhVimthAa6SdxCs/V40us2MRCe+ae bLmsJBleh8wJlNUbirT04E976FZAQX07W+rstUpVgoBsTvYm4jA/yZDqnt3Ml2rG h+pmd0e4CUuiKGUtE1TyDZ+rH1GGQqt32SyMMnjs1cGI3l6JffOvCMzm+cc86/+S aOi4pQ4vs9MpOtJVN0FXep2JPe6DkwnavnpLO+5tEQkuoSSBBHmwBLk1HRZwHSDD EfnzOkP/djCcoY024cgvIIgtu4h5TsTXkb5vwH3t+6E8WaJK6Wx2XR2cLdF65SyS orqryO3jLPVMLAEBPaX1dOVNSsMjAWtjIHYXWrAVLQFpDh9Va+SVlDhNoKoIQoa4 Qg/RYdUB+KxamiavmLG4wyqv3v0Pi/lA3fQoXRnO6+HwdCNU6vPb/Kq5iguRS311 6zQ/qBUgILx5Ri/F3JKG4qTIfEj3lAcxdpPkO54BkYkCIgQQAQIADAUCVcxKmQWD B4YfgAAKCRAhEV35W7p8RHw3EACEjIKUek7Rxa1olNxURMwzSpUVGLzlMRz41N2g edD4J/Rms9QdcTMcnyWpj7kUOUHaanO46lr6NRNx0b/1HDTCPxjVT83QiqMY39OX CXesTL8Y9JVQbvEN3IwwemQo5YGOaf2oisL6CwBP+PmKTqqugClNibCdtmuQYTMO QMrgcba7VHDlhH1JiRqIPF6+CgnOFwSCF+cwJPK3zJhe7QYZ6FGXwLnTSJQw7Jxh 3lF50px1dXh/5iIMAg6oTEShuHbBV6R/5FIzovvrkOAHopidUsARoc3Ca7Ar1ZT0 De1RZ3SZ6sOczo9cKIvPRLGAMj3iCe2ovRVWABo+gMEGjX8YND0UcUywXn4CIp7k yAjXvqtkWyG0RU7yFmTLaPJVKGxAYGCBI4unI+4I+fT46gp9gIA/LJQZjpQ5x1Ji c3gtKySv7wN8jCJRCx8qeaBRcWONuZeTEZnfrO1MK9ftsaREW9wxXDtBKijjv7Z5 b0L32oS02nvTb8RjkbijZyZgn/YU3Jxyev0FTM3e//q8q4qelaHoNfbIaM8V0OUN W9m8zEwFczq9f10+IEXDoL5MU/lsYGphlPfAU/Is6nhWKBgcg6bIfW+cdZgTrjGF 4rGct5NGnzvHcmieIGr60uWwDRVa5wplz4GyrLcfJmCG1VnZf8CTOaFEeTL13ikA jboU2IkCQQQTAQIAKwIbAwUJBaOagAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AF AlMgZ7wCGQEACgkQe3UoEb93O2WMxg//ahuuLNR3llEcRfx+z7NS5hWp+NmtXK/X xjThEJFn/H4Vm4DI1bH/NKGPfZIvFQsIPFm/kg77om4BNHcLXe9whYJGYEJaZS3g 30ORjNKMTkV4xupfaaXrPZebz4G3uk+H4UZq2FTjyFyaMRv1hrZEEe+x1LvMSQFu B9wwrO7jHzRgt3tkfpWHZDMDmThDkbTvDJHgBYo+xWoAAXYvN7BHb8lpzaPdzFkm tUbyvNCFozDyrhaY9l2xPCytTETlHjUsy/rZo5E2x+aNkZhUMyReElOD18S6Ct9Y QPdJlCthx3tiLzr91CXo7fEEIBuh7sXMLP18aNtpbaEo2hH9Go/buwaHyKt5twPb Tuh5lkfe7L06ifXeI7cHEPIALEDAbaetpKcmlqLOZM6T3g8O7c73CHaat4hJ9+OQ 7mnM2iVYlP2WxpYMYIZdXpM8661PS/6y0IgVxEN+v/TaOuE/C0Zqp0EzTvRANF+/ 5RVXrZQ5Br9StsIb5Gpyr+NQ85lfxCPkx+3LgKKlK9Lh+pKNWd5pocTmevgyetOq vLEyQUWh7eCHyta9KJiy+rbMIxnqbcMVX49TNWyllWPi8XR0OL1f8tzgbjQiLXLo vWvRHYMMVR4i/BOxjMEjF/l+C77vEzF5oTSQhe7+T34jRyG1WszI90rhH5gS6ucW 9XmI2JDfu/20MUhhcnRtdXQgR29lYmVsIDxoYXJ0bXV0LmdvZWJlbEBkaWdpdGFs Y291cmFnZS5kZT6JAj0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJCAsFFgIDAQAF AluyK5QFCQ0kXxEACgkQe3UoEb93O2VMURAAj15x2gsolepu7P/MYLXeqdox6yMc On3ob01m8VOyTwVfXhl0xhajuABm45GuKGr1hCImaQSxuouW6EWiuzUELbfjZK3T dCumHnsm6biQGVy1kPH9/SHdm7lg65OO6O2G/FejOd8SHe+zmfu+JO/nGNemIoJu DRGg0vfWtDOgKaVlozk69FCnhb98d8mkYgbma1ptM2DQ4yGjXrCtgYE6oWl9f2SF B67CVNl4Gsa0qIDJch6wOrX6iojGfreBEzTciHq6l5Hxsx8ClGrA7GujJnIJweay J8/MY2rlGLclz+MugMrryQqvzXEPFAdu9z6LVPjqHN2Ht4YZxqheGnbKUlWPBQwu WR7uzcYAHcXAM7Qa/R3DzEwWK8dNnwVvrdOQRNe3ZWaB2z1qcRz/Lao1fPs+wuke US0fA/G0SVM53J0V4KYs1OccvQ21N4yuqjBe1RBjU5Qt5tQQxCTh9xdgUpxaO2Fk rIpP9oh+7+yZUIXM7UmaUTruKTHT9LNCLSwDIjLYQuo8NJAxK0WhULlPDvPrlFeZ Z5HvkdwjgKLf4DFRvx+F13LI8VQsVZBZ8gPJ62KVegJiAtLDil8j66r7yVDcxAep IL5KAETYw+7mue7FN2dl8Sq2BoQIzjAEgEH61oLO68HPd0p6z4lfqdXzbgAhgFhB fytiiyT0dQejkCWJAhwEEwECAAYFAlTrhPkACgkQ65l2pM+jSTOGTBAAhQitQDJz +f3HSovpOmz4qXCLjiTLkQM1TLifRa0f5UgSNWomrpZ/KticGZ0PfRx+d5t8YDCB 8iQqrKAsY6LqMhXEfMJSWt4WndGiIqf51w3sPSxkqWjgTbwglNcj+7sB0Bu1CDfr yc+r5KBBj/kV4Jx707PLMYpqJmczsLN9TQsEd0Y21trnsjrZkFP6zenX7P/ZAscw 8gbBq+G/Ge6qVtyyrx9KzXBdr4UYwlXxZ83znclTl2KJjTFKjrptsXBGMC6OmHOU qCXcFYf7WYMRiOle8kN1C8cIR9ENNySA15a3ayUA/33o4JeVBEeYAbERAdEqqlIt 7xGVEgG65kvj2pnDNly2t6rodLooZgDZgMdav41Nx2MZurbQf2IiN3jLVE4JoGTj jYUWVaaIGdX8Xn0o92u9uWB1hOP/937ckQPygnk/ldBh/vy/ttYIe+NZN15ptSom TZxjkNEzUs+X8i0Ny7QxQNvghzJfaOcEpzy+dlxyuJsqWYrkU4iaEU3VSqSY8fcn JU/IcLVmxngF4LoDlYs24eZC4E6iyOtSHaiiCDW6Mq2K74c37m4dJlEMttGvcSJd 4Z5D/sAgS6it6BKw550y8Hpczd4jiy+wllOjR5Cs4+ppZd3C5hYWSPZlyJ54coJU a9q+3AvhxdEI/6gfiWTkEBmrvbpCSKAkj8iJAiIEEAECAAwFAlXMSpkFgweGH4AA CgkQIRFd+Vu6fETXsQ//VZCg1DIT9yHx2gC309Alp59cO9WNVPXRfHIpqCxFWYW3 KXVmB6aCWoiRwryQYl6LrGnmOIXjRQICDQkMwRQKaO1Y+C93HKvdqnY5mqa10hJw YcnBA11ShV/Ya4e8ZA/v5/IUDrt5UUwgUgjifnODKaM2RmuWwdEFzVcKov95H7RR Z+QESJURzJhO3C0PwFimzv3di1iKt8PV4yTYmERZpzQM0epDFCOkNMDXqGUNaXUM hllT3q+DGe9eWFjvtqB45Iqh4ImfQu17vqOW1VtXLUc73fyGkkbmKCrYJi29zQm4 wwRvbhJvjQPQctEeZOT2QyB4jqjfdjOhk7Z7G3tuDka++LJ1ybudysmamlIkooBR rSM5KxIesz8fwCTqEHBNQbawVE8zZqhu7j5suwm39QthqMHe8bujQNr2HO3zq2OL uaSoOruMGVeBa4Ax98UEah0AAtvibuMHFvXJJ3MV6W5iPW2MkByRvgpM4tL1Ez2v ezUVrjLjLxp2R4dZyGcgdtO3WnKuydFxzYUaUZuML9XoMxjOQ9l0UZS6tkJvSqgH wrgV7kv2qQ3OB9Euq7lC2brBh7khmQ+VJE2QOEfMPeJL0onvEq2mNF4N9o1lZiFZ pCpcmmp+K2tsMbRG32UfmQ5acJT8rlti1LSNFV7RIxLS9l2EWxTkVN0YWNeJvZKJ Aj4EEwECACgFAlMgZuACGwMFCQWjmoAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheA AAoJEHt1KBG/dztlbEsP/38Y+5gWkPZZus7mhX8YjiACjUZeyA9d1YoSSlpbpBOY hac8tmuw+eYQKV4OIjSEzSF+G0dAAyXlCHVCWkOQkHPoRzSUa36Ejof6vfTAbed1 /+9qLL+hsBt/Wt71mGUH0aQdw7Jit5v7R5vzzJsDL0cKunmQetml32lXIQCdyKAL IZPj5Nhvqc0KHgmTFPJJ30ENLWyaZlKrKqPnogzZT0i3cE+QwcTdIl+3BWX6k1/7 3IK6V3iQm3lHOXhDIiKtZFRPAxphUT31pmDQ3jDb9kzyYMaveIlakWh7QtDP/01Z +gdzRN32kQ5mHIlHmwiWUWjCLmj/a8egINa/h+kz4MJUN2j+t0ALRpXvhd9y+OdV 1m/1QXwLI2d8nsB8ikBANvp+tw1GyfdFT+g4pI+RMyFEfvCbSCJ9yvKiWvSZdgzh /YlpIPuKHl+X8b01sJ+Zutx2zwcremJEUaJeRjXCEdT94/zElnAuRSbP04eE5Zga HibKv9x/LgeLjnx76iKw9vgnaFbPkL28e4sS7eXBTsE2DwT7FX176LlYKFKMvVbO GYR9x4TEFVX7/Jr/aOQXVhQc0UY/mo3xE5tMHDk9X2e+ka85PqgVr6B4Ik3hFjP4 bIBfk2sopg2BLucjtbg3y+92/AKvamt/CdXXdGRgpWk9dKoeWmOqtyNEnQyM1BUg tC1IYXJ0bXV0IEdvZWJlbCA8aC5nb2ViZWxAY3JhenktY29tcGlsZXJzLmNvbT6J Aj0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJCAsFFgIDAQAFAluyK5QFCQ0kXxEA CgkQe3UoEb93O2XMlw//Z2/aXbZO3lJvuvfDBU3fJBKxp87EButnuwudFyaNupKx O13R7rBKB/Oti/rNP7IlK56WwU10ldK6C1PYnqru5L1VCjWRi2Jd/XlvgXlc1jqs tbM7NfU7pGOzctJGYpKh+7b1EdSM4V1KnDKcbKicLKC7zS+dHUdsch5w5XJj+pZR E4R0KEA/vEBB4ba+m+b59WqzaLin2pOqyo4Ff9o5uVgxlNrLIJQsg74TMTQP8khy DLfmyiN42VVkOBOIPMLA8ljEA1I7I4WwW3bT3mxOXHUExey/YsOdpqYX+kh7u/tj 7kbjKQbdCwdwUqSOPLmW9/9Wxyf2/xi+3lCvxzwPPElnK62yKlxLhVMt+Ah3J2Qe LmrVGG5XPQzplrmQ6ptpEC9evrK3ALBJ+UGGxyyLp7sPb0SbDq70tZLRtbcE6Qnp QA2IQIPTTy40lGVy3a3iXiDM7hzbljWS0XSaEHoZ/WdgKLV+OzVZ9vrhP+7HrK7h EzdYqCvNfcW6bk2KrMN0RxBBOAbiRne8E0iTffh9uTyW7sAE0UDA9J3KtD3fpkld 9cQrhwUVsjuPfbCqnhCk0B7ro1OR0DHBbgMVEylEsACnHEU4XWvo+U+0MgJtDQjz Iy+XZfXDCs1VOy+murgcs0YIFqesyYOaaF1eP1S0Yr18n/pfAPCFfg0rhMQUyoKJ AiIEEAECAAwFAlXMSpkFgweGH4AACgkQIRFd+Vu6fEReyA//epitdszV5ZQuuL4z 8XPibWlTaVwLh2PvW0dEB6ID3qPdGINhfff9OT1rjAzSSzH++GAhDjwVmeI3fKBy 5ZNnOKSw+QmBZDOVcMEdf7EbeA9elm2IEzjEHO45c1ZU96jWwD4TX/32uA8CYZ1k aeqVl4Pnu34rQaCiSxdtCbC9AATLL3Q+3ezImwTXeicslnhT9HdwQKkiGfzc0MJM wlcPAc6QSD9sXGZNPFb1+aEHdk2xB381jGhPuE0nyKGfpJadlkW95yFt6hcRi25s DvypcDIRU8QLErH7Efi2kYtza3I0zmsWXarZ7hzDLY7FGpwYO8nvYFgL82AFM/3v TnWqv8nqM9RX5F6B9rYmM9ln+VmzUV8Ntr3nqXPV3oRJeeqydR5NI8sB1901d9PP WpL/QN+acmMh0zgapMUBzBETx3rhR+Ad1ynZgeMq25k5tC7+BK7sd/2rxie/u6vj 6CWYKHNjIRNHhYPspXcI1KlsqTYyzpcB7pQaz/CrXVGi7tpVBpOHdxGsbDttjahu tDPAvrSryBn4W0/PWn001fRTLkyRzRNCOvp7WqcKWmTUkfWf1/IojTGug0WN3Q2S /Il8OcHAb/yxNQILSrS+OaLnDFlKayV1lvaN8tweqdMudhHJnm5SP7NFRQvy2Z5g X/lSu/9rVAyHxAzPzT81/4kFdlqJAj4EEwECACgFAlRyUlsCGwMFCQWjmoAGCwkI BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEHt1KBG/dztlqJkP/0zKrL9PbZ/OuSeF 2UiORhdr4sr2awJZNdQYIcXNLJbqa+78J1lL9YCYmoiR0msQ2RkQlP7J7XFJD6Z7 nHp3iKA1ZezKHJz9cESZClK6RD23HpJtoGR6farGZXDhb1emeCRgMSRVZColkAmv K/i8FNgP0Zgje8nF1KyZX/Yz2A76wVTI1EfsTs41x+XoT8EC9nPwBXEFmLrlPYUp VjffMAdrTC1nTE3uLUAPRgcPhN/h+w/xdQW32IGQU0YEon5qHldYmWpbetL3S4ef a5cCyJqYx/nKAQCpEqvrFDNbe4Bmn8RWEHNibza2HpXYPsqo2fdgXMzcNkJvjtU6 CSgRTOxVVuvGRZQZUpCdP8WjV0HohPXZ6Y8iOVlsk9vey11EAMElDLXKlQXucJ20 864GUZHIO1ENzAs5Kyv9fdAYc7F+XeHfG0D+OUnJ6E+1J6DVBpdSNq4/ILteO4Fu rjRK5OrpPLzoDvBgwcdyw5pzqAoLFC07YWBU9ci4SP0yAnYCNq3TWGMeOypfA9qH L/AIJvSdPhgIAH4q0b4VboxChHOhrJinxPWY7JL59HVJwdFwwzCxuo+RGn6fLcRa bci0MEuATvx4pND08mmZFCqNA0cCwRQRARTDGeYktGC8yzgH+w7diZNszL/BM0/D manBaawPK7m3D5wFrbA9UXy+nNkQtCpIYXJ0bXV0IEdvZWJlbCA8aGFydG11dEBn b2ViZWwtY29uc3VsdC5kZT6JAj0EEwEKACcCGwMCHgECF4AFCwkIBwMFFQoJCAsF FgIDAQAFAluyK5QFCQ0kXxEACgkQe3UoEb93O2Wjog/7BavaMOQL9ANQpV5TeBRf fHWpeXC3dwNAcl6I5niB2wYp/87+9JPoMFrLwxOPU/hhKQdyhTS1JUYs2V6/9aWf 18PNeFDrtBkmo5vtIG/vORFqSYp8ko1QembMyDqdSTA2Nn4NeUeTKH1th/0gxpiV Sl2RZ6qeIVU3dYudu/p6iZkoAdZU86hyLCwI6YQtJrzvTSgGwUwJfhQece7ciVK0 ZG7DG6Ie/EW+eFsJyjW8Zt1bYQgqVAuxVy77/TjTTXTl6Xor2OhxuSQCvRxDzQF/ 4dg4+Ua1kf9H2cGXGkDDhmAmdtmdEdwoeiQcQd/hX7pdQ5mBN6HIrgPKJLYYoBiA WHSgwNlCScd2fjISbQ1RqiuRwaseS0LZtf/g3U9fky/TFitNmyVv+pAxU3YcrrQD C6uXyUgdqBHHrxC8iMNPZajusHfBlkDGRxRxoM84kV/t6ONiZ5JG0muM/i2MyfJ1 uDNNszQ3UUo9EIq/NJPbV3DAkiwLOPT3JOmIw4rJFcYdrlN6367Gy+EkiHv8htZf C6LqXNJMtSBuPAqrvpKaPxBW4N1bFEQNvxbDqAaB2lnHgqOqfQ6ta3KeaHsv8shr LdFkNjFw61o28sX753UKoXfzHjSonDDu6/bM5WeBpQAL1+fy+PxR7XanxDoDVdFN 1tf0fWEDDsrqKfT4xfr3b9KJAiIEEAECAAwFAlXMSpkFgweGH4AACgkQIRFd+Vu6 fEQ3oRAAgpy8MdVf3NDT/+ntWeOY3ltSk7xsBnILeudGoq2lF2z4N/JCJaqnl0i8 fh4L4bYOL0qgzVG2+dzkZ3PjcX2CzLHDhcqgjqIYqDbVQ1BOIv1vUdLFK5b2I9hC KH8KOp/MWqIwX/rj7NFK670TtiLvgiM/z+PUSJ9aiSMEIy35OgodbQ9RVjq9HZlE s7E6sHXiKqkDlagM0QBXg1cSD+192RKB5bZkOjxzkqWGJ3IyCYJFpD2VSIjEe4cJ upOIlW9GEYdZ4H849PYiFbQ+zTx+VilhP8qGmYjSMlcrVs36sQso1P4DW4h5H6AW NQnSJkXhkHwGt/yh0Rt6i1tgHyFVwjPIUYNpNG+G+YBNz7ClIcvivA3wqeQBpA8n 7V9bHSWxyJEGHA1Gpo+zzwnNU1aQVJP+JIRy7qo0hxS92qyS2jn62zx06gJ0XM1N uyq8aj9ZKWA4NeKhxbIkEoiYRwGg2arQOK5arjOVMbBTMb0HouV/aXbNbBqLQbzD JE0ZQFMAZEb9M8SAtqi9Bmqb/b0IZuu98q+EdDWZYmGPB9T+fdgB0smeDmTGZaKa bbg+RJ9RJCfQsG2HZbIT1Gbl1uv241N9QXZBHWPHp7j19LxHV7Qo3V713QFYsbiS DrOITZ0p3aezR1JLzQlkczGR2myaOSxrb5ucS8rdMdNLz+g1wa6JAj4EEwECACgF AlTrhl4CGwMFCQWjmoAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEHt1KBG/ dztldoMP/0HrbHGRL7LT9qtbr1Oe8Jge5RZPQQvCFKzNUaiJqlci/0c6bJtEFwn9 53tCquvBQBc11y/vsk+0uSUaa3zLTOlGtHHaEkAgjv45QfaimXptTd3qPHkT63ZS NWMZ6C4RXsP0O8NhNw9aNfbVfk/jpJffiTJ6dnCsDVX2KAXHKxNfevY8LcBuJTSi 3hYScMOgqlGWZn+pwt7KrgpJ+cbsK49rbyGhnrePdCD/U11Cp4aOM41360Wc1EXJ 9yD8eTSqilgNh0+z6jFBFcVp030kjfI3nP76e5WAT5iF7j/iJF2hZWiJPN0gIYGv 2YRGy4XnsmgCXh82ynyrmSlKagUPvk0mhj4gWtMIQOpp/+hIPCHEOqSge0l6pvW2 rO716dJ4xZCqz7vdgM1xiaDeodoLEDRuNweuWcZ34c89lTm2m8/e+RN+kS2caD8o gg3scqFeLQtY9ZwHb7Vk967HxtY/GcQHInAE2/xpb9n3dgWeBaNdO6TcfDOSeVUN +hhkc9ylmwbgilDHg44k/MM3f2O0xTbUSUg6q+0iJ/vT4N+dH6+aGEYKGtN3ELAp q9K0y2rks9A6I967+QYJOsUVF3T+sDEiYh4ZlMeOgjdKw31Puv330q4C+ZMlar0i Zsfg/xetSLp65uWdoF/CqIjJwDF5P509eXTiT+8kv5U/da98jLvgiGIEExECACIF AlMe2u4CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJECTQv/bZcsa04j4A oKTjH5PMb7cDh1jROV5mSWz6snucAJ45swJdMPzn/0fNNQFrNPuz474qybkCDQRS UDN6ARAAveU7P66Ee50S+i8lV0TGX4xMculhxqMDRAvMNd7SOIBh0H4mm+bsIApq eLrX96jVKcfJE5EQuPGX98vfK2ODfJG9UAzYj7GDuUgHipcvmtHkryIXinH+NhXY IEiLA4pDqBURWTaGmX+0+o/dB04pd0u7ew4zViCDc83l9z4jsHqW5yHHoG7s0BHu dYqfoPU104jVRkvoOvox7/qE1UkEa8MXcWbbHQKgge6MWSx87Fm3ChkxefXc3Xxk PJA4wDz14c1CUWuL2LnEbeVowBbYzRujN/4XBMFeiYhaRPZOSPeiZbxkhx9qCzZK lGRCXjmkTrmcsorfp5E2g1sGi+opqUzKEqy0VOkiONNlEwjkRnzuPuBhf+CEKyzY tnPhfRZ+8fqVi3xi+O8j1K2XgQ2826RBlJmAilpoCBlx5fK4tqP4VjVxVcrcChOH 6Wit19evdNIHGVvXPtw0eqwj291HCx8L42D7JGs0ac3DTTx+AOr1+Fpm6zWSu09D NPInMzD3Gcsq4eEcVuQcNpbUZv12cQIEXxpPSSN9+AQ0Rrkrpt/IAYZnnOKQG4r0 Rl0hDQqAs/nmF2djs+KBdrNKy9jFUHrb4HSRFjGPIztQBfnn5B4PumQ+EGZGjN41 hnNDG71zJ4Pzd7Vh/t12cGSQtdXJPMoi60aHZHYGRyaRsEpO/bsAEQEAAYkCPAQY AQoAJgIbDBYhBNSti5wWe3V8Twjod3t1KBG/dztlBQJbsizABQkNJGA+AAoJEHt1 KBG/dztlsVQP/3uIdeA9hJlbJn2vymClG7KggrZMqYKVTFyTVrRZSRMyPOLSBbiQ 4iPbA05SexGqKjE5VcCDRH2LHWXr4sELz6b9UWhHfsFhCwLlavOSZ5oUKGsE+z5i U0PRXtNY2rR6UG+w24ClXFI7Nom7EKcf1Yt7ezh8i97KZJw0Bk6bfUMeCaQNxvX8 1eD3ueiGpJ5b6Td5BuFuisxFPeQxpes9MjypqX1Oxh/oqF8+LrV9ucZbps0nQudZ CPZvudvqchH31yvSw3Kao6wLoarTIeFNx5GXb8NEF75ALGiIUqzWzp/sB/5T2v8m Qd904sJHGOYDKXbbOWGYF42UZK8NsmrLkATt8qjX+ZVDYI2yQXQFw6Guue1V/gDW DLc6UhecJX/8cfrDupEGnDSKekPlz03LbRo12jyZLfKzNwZktzOR3HyrNgRcEI7z NIOJGWWt/p7wfkBpB20cifFDZjB2rP8ejzWKttw9ofAjs/3+q+bNic9ndQs2Wsj/ 6arShiQIHygH0dbQL9gZn+chhjS/EOjLqfoSETOe10CMXo9q/5AcHbXp8Gwswuzx fj49c5z4xoCZBBPJMX0Ly99CTzoTh5GZAStjDRphVHttSrJh9fx7ZzmB6p5Kbo74 Gu/otC0Ns4khyYlbU1LxdWYMb0maRu1iqGdENAxP5gUmKtx8NiZS8vhbuQQNBENE 6+wQEAD5GKB+WgZhekOQldwFbIeG7GHszUUfDtjgo3nGydx6C6zkP+NGlLYwSlPX fAIWSIC1FeUpmamfB3TT/+OhxZYgTphluNgN7hBdq7YXHFHYUMoiV0MpvpXoVis4 eFwL2/hMTdXjqkbM+84X6CqdFGHjhKlP0YOEqHm274+nQ0YIxswdd1ckOErixPDo jhNnl06SE2H22+slDhf99pj3yHx5sHIdOHX79sFzxIMRJitDYMPj6NYK/aEoJguu qa6zZQ+iAFMBoHzWq6MSHvoPKs4fdIRPyvMX86RA6dfSd7ZCLQI2wSbLaF6dfJgJ Co1+Le3kXXn11JJPmxiO/CqnS3wy9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlL OCDaAadWoxTpj0BV89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N 286Z4VeSWc39uK50T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/ RgBYK+X0iP1YTknbzSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2O u1WMuF040zT9fBdXQ6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqV DNmWn6vQClCbAkbTCD1mpF1Bn5x8vYlLIhkmuquiXsNV6z3WFwACAg/9GGe3KLry SYYbHnRu03yEajBfo5XRp6maVe9Q2Yf5P6zMqNh9RIDEYl0WNzYCzlgtiXBxcoth g3es54ium5gaYbgg/tbLrsTN8UJgbnS0dzG1RPP1uP6I6Ml6xtanYTdI13D5X9yT stJyzztcfinkSRB2L/tJvND1H3zF9qCbNgbR84+VKqH+TVwEQm7VowEfp3HdlZ+2 8zmC7OOwhiMPWWKQmylWyoWVIpLPRV9ZKyt2eygy/w31cswhsPzWb8jWmOY7OaGi kHR+0cGtP+K3yhK+yGHUV1GapbS33Oww7SAmKikN3bEE6mHbE+zqAMizuUy5uJC2 38zhNmZr6ahxN3gNIhPIuxMPQnm7SqnY3a0i8suiS+52GMoSEEhOefg7xg4uoqIu z9hhZ3YhFyCwNQecieiwBTpved0+9c644Lb9Qj5owibUtCHZtPm/eup5clVSfjm7 qEQqZCA7pzRrZDUZtSB+eImJ1Q/HkkNluwPDZ3XJLvtR0FpV1jDjX+joDp2rIpHq ZcJCYMmh8BX3giZkZ+zmKMdkeBAgTDe+4oZy9axyLxWw0o8hKSERKTUv6hKziLqr /j71+x5pItld9aCnlN2eDr7TVh0h1mJZalG/EAcA0LEreyfLgLHhlu/oMgCnBPhg aBfeW3lB41oZFoe/YI7MaPhk6t2yCYj0jpeITAQYEQIADAUCQ0Tr7AUbDAAAAAAK CRAk0L/22XLGtHs2AKDKm/OoZkC0MAgODVT9eqF8FH7cQwCeJrEHw27ePvWnYGTZ DbJEN4UMLUA= =Q9CP -----END PGP PUBLIC KEY BLOCK----- --------------1FFF5D9C7EBA6BACBF804268-- ------------=_1562877424-28004-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Jul 2019 20:24:28 +0000 Received: from localhost ([127.0.0.1]:38656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfcC-0006lX-2A for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:24:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:39860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlfcA-0006lQ-Vz for submit@debbugs.gnu.org; Thu, 11 Jul 2019 16:24:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59943) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlfcA-0004QX-65 for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:26 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlfc9-0003Vd-Cj for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:26 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:34672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlfc9-0003To-6f for guix-patches@gnu.org; Thu, 11 Jul 2019 16:24:25 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 45l6wP3Zv2z1rJgw for ; Thu, 11 Jul 2019 22:24:21 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 45l6wP2lhSz1qqkC for ; Thu, 11 Jul 2019 22:24:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Ot_pD0Sp2Ql2 for ; Thu, 11 Jul 2019 22:24:20 +0200 (CEST) Received: from hermia.goebel-consult.de (ppp-188-174-60-166.dynamic.mnet-online.de [188.174.60.166]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Thu, 11 Jul 2019 22:24:20 +0200 (CEST) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 9CB40603AC for ; Thu, 11 Jul 2019 22:24:23 +0200 (CEST) From: Hartmut Goebel To: guix-patches@gnu.org Subject: [PATCH 0/2] Add pngquant Date: Thu, 11 Jul 2019 22:24:19 +0200 Message-Id: <20190711202419.5078-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.18.0.9 X-Spam-Score: -2.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: -3.3 (---) Add pngquant and libimagequant required by it. Hartmut Goebel (2): gnu: Add libimagequant. gnu: Add pngquant. gnu/packages/image.scm | 68 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) --=20 2.21.0 ------------=_1562877424-28004-1--