From patchwork Thu Oct 10 04:40:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 15678 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B1AA517560; Thu, 10 Oct 2019 05:41:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 396EB174BA for ; Thu, 10 Oct 2019 05:41:10 +0100 (BST) Received: from localhost ([::1]:33890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIQGD-0007QP-Js for patchwork@mira.cbaines.net; Thu, 10 Oct 2019 00:41:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36432) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIQG8-0007QJ-3z for guix-patches@gnu.org; Thu, 10 Oct 2019 00:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIQG6-0000bF-FK for guix-patches@gnu.org; Thu, 10 Oct 2019 00:41:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iIQG6-0000bB-7T for guix-patches@gnu.org; Thu, 10 Oct 2019 00:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iIQG6-0002pC-25 for guix-patches@gnu.org; Thu, 10 Oct 2019 00:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37642] [PATCH] gnu: Add filters Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Oct 2019 04:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice Cc: 37642@debbugs.gnu.org Received: via spool by 37642-submit@debbugs.gnu.org id=B37642.157068245110834 (code B ref 37642); Thu, 10 Oct 2019 04:41:01 +0000 Received: (at 37642) by debbugs.gnu.org; 10 Oct 2019 04:40:51 +0000 Received: from localhost ([127.0.0.1]:54925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iIQFv-0002og-5Q for submit@debbugs.gnu.org; Thu, 10 Oct 2019 00:40:51 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iIQFr-0002oR-B5 for 37642@debbugs.gnu.org; Thu, 10 Oct 2019 00:40:50 -0400 Received: by mail-pf1-f193.google.com with SMTP id b128so3075577pfa.1 for <37642@debbugs.gnu.org>; Wed, 09 Oct 2019 21:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:subject:from:to:cc:in-reply-to:references:date :mime-version:user-agent; bh=NGvcWWqQkYfxHWvxNuPs/V8AVBmry8jrT+6+axzc5v0=; b=LOpyVzK+CqdvP/QS6Z6lm4JplXZO0R+b7J5GsvDGxT3LLA40+Z+R/3HAjaR//TPGs8 rqmYn9dyc9L8zEgLh08rQzpLdnL3g7RLgHnFQNeQzFxWyqDshcWBrHfgl6vLobuLqO2H X5cZ52vUScscQzTmleznIC8+LND8TisVcsrmJoFPstEff/Oe18xdZkfdH6ia1NtxliAw vobDirTOcANWpobjNNA11vZA7qC+LxJAorDOZnbcT6Wh+qTUvHVUhSucCIJ0xrbadw0p mGPcPZx2QZ925Q5Ak6eZxhsaxvyjLvKjq+pSFk1uKNVBlg7L2IF8Knx/NHcg8A9+2Xcu GvtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:in-reply-to :references:date:mime-version:user-agent; bh=NGvcWWqQkYfxHWvxNuPs/V8AVBmry8jrT+6+axzc5v0=; b=DMllBlvpohYFl3OWWZ3Dd4BI/0soEiYtkUaxEI9R9LGjmMP9K3dcOEwz0ejUvlvdIS SknsoueKIVKGkL/gpjwnvWlqoKR+gDjFGg1ggv6DReI0LK3XPGo/kCWwRGqHcJ1c10z4 euKr3W/w+czgq9ewNgTXPnnzubAazPJv7XkIdDoXy5l+Ep4k9AK/3e7upSh3Z1LRPI2C utyHthPiQBMSkUNqioSqrsyTFMGFWoK7l8U4RRnWrYPblPUmOSsoqdlldTufXh8onf/D 6g+PlMNGwCVS3Nt4DqNUacE82qushmF3x+2UjjomMKv/wc2yX0fB/RoJQEH/jeQNn6xt TcFQ== X-Gm-Message-State: APjAAAXV095gJAMy8grNeAE7ZvwZ63Pou2HNoX73HhwBVhG4qk+UFWdz MGTLmIhm9V5ofq+bfua0HSKuHweo X-Google-Smtp-Source: APXvYqyCtQXyCGO3UXWW0xncnou2n0hZnKVneFdA9YDHrFO3s/FiY5qT7TPQ+aMNCShSfw0OBk0+lA== X-Received: by 2002:aa7:838f:: with SMTP id u15mr8169117pfm.189.1570682441193; Wed, 09 Oct 2019 21:40:41 -0700 (PDT) Received: from piranhaplant.local ([199.68.53.171]) by smtp.googlemail.com with ESMTPSA id a7sm3507038pjv.0.2019.10.09.21.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 21:40:40 -0700 (PDT) Message-ID: <48d0e5df510f6551be63c9ec4545f06bdf7ffc5d.camel@gmail.com> From: Jesse Gibbons In-Reply-To: <87lftu9i2b.fsf@nckx> References: <6f4a21523a30dcf3e3045aad994d8958c78a7b72.camel@gmail.com> <87lftv1dwb.fsf@nckx> <14cbe887a25f732826a1e920e2d0140dbce51893.camel@gmail.com> <87lftu9i2b.fsf@nckx> Date: Wed, 09 Oct 2019 22:40:39 -0600 MIME-Version: 1.0 User-Agent: Evolution 3.30.5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Wed, 2019-10-09 at 15:14 +0200, Tobias Geerinckx-Rice wrote: > Jesse, > > Jesse Gibbons 写道： > > That review was a bit of a mess. Let's see if I can rephrase > > what you want, > > in a human-friendly format (no emacs involved): > > Yes, I'm so sorry. It looked fine while writing; I'm not actually > on crack. emacs might have been. > > Use a patch instead or move this to the source's snippet so > > kenny is removed > > from the raw source. > > A patch would contain a ‘negative’ verbatim copy of the non-free > code so isn't an option here. > Moved it to source's snippet. > > > + #:tests? #f)) > > clarify we have no tests suite > > Yep. Ideally that comment would be redundant because we'd never > flat-out disable tests in packages that have them, but we do. > rednotebook's test suite is disabled because it fails, but the program itself works fine. There's a TODO note there to fix the tests. Added comment. > > > +The GNU project hosts a similar collection of filters, the GNU > > > talkfilters. Due > > > +to copyright concerns and difficulty in communication between > > > maintainers, these > > > +collections have not been merged.") > > You want me to remove this. > > I think it's appropriate to say something about gnu talkfilters > > and note > > that this is not the same package, given that filters and > > talkfilters > > packages are often confused with each other on the internet, > > OK. I didn't know they were often confused. Would it make sense > to add it to GNU's, too? > > > but I will remove the last sentence. > > Great. It's the one that bothered me. > Sentence removed > > If the comments go beyond 80 characters I will move the > > comments above the license. > > For such whole-line comments you *would* use ‘;;’, start with a > capital letter, and end with a full stop… > I was able to fit the comments after a line. > > Am I missing anything? > - Cleaned up package descriptions. Only one takes up more than a line now, and they focus more on behavior. - Changed "80's" to "1980's" - Fixed various typos New patch is attached. > > Kind regards, > > T G-R From 50325522d953f06325543efb61f1fa26cb98340f Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 9 Oct 2019 22:29:16 -0600 Subject: [PATCH] gnu: add filters. * gnu/packages/toys.scm (filters): New variable. --- gnu/packages/toys.scm | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 87706d2277..62c07eded7 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Jesse Gibbons ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +18,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages toys) + #:use-module (gnu packages bison) + #:use-module (gnu packages flex) #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -64,3 +68,92 @@ on the text terminal. It serves no useful purpose but to discourage mistakenly typing @command{sl} instead of @command{ls}.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) + +(define-public filters + (let + ((version "2.55") + (commit "c5c291916b52ed9e6418448a8eee30475fb9adcf")) + (package + (name "filters") + (version "2.55") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.joeyh.name/filters") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gaigpda1w9wxfh8an3sam1hpacc1bhxl696w4yj0vzhc6izqvxs")) + (modules '((guix build utils))) + (snippet '(begin + ;; kenny is under nonfree Artistic License (Perl) 1.0. + (delete-file "kenny") + (substitute* "Makefile" + (("kenny") + "")))))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-install-directories + (lambda _ + (substitute* "Makefile" + (("/usr/games") + "/bin/") + (("/usr/share/") + "/share/")) + #t))) + #:make-flags (list "CC=gcc" (string-append "DESTDIR=" %output)) + #:tests? #f)) ; no test suite + (native-inputs + `(("bison" ,bison) + ("flex" ,flex))) + (inputs + `(("perl" ,perl))) + (home-page "https://joeyh.name/code/filters/") + (synopsis "Various amusing text filters") + (description "The filters collection harks back to the late 1980's, when +various text filters were written to munge written language in amusing ways. +The earliest and best known were legends such as the Swiedish Chef filter and +B1FF. + +The current filters package contains the following filters: +@enumerate +@item b1ff - The B1FF filter +@item censor - CDA-ize text +@item chef - convert English to Mock Swedish. +@item cockney - Cockney English +@item eleet - K3wl hacker slang +@item fanboy - Echo instances of the words fans use. (supports custom fandoms) +@item fudd - Elmer Fudd +@item jethro - Hillbilly text filter +@item jibberish - A random selection of the filters. +@item jive - Jive English +@item ken - English into Cockney. +@item kraut - Generates text with a bad German accent. +@item ky00te - This program places a very cute accent on any text file. +@item LOLCAT - as seen in internet gifs everywhere. +@item nethackify - Wiped out text like what can be found in nethack. +@item newspeak - A-la-1984 +@item nyc - Brooklyn English +@item pirate - Talk like a pirate. +@item rasterman - Makes text look like it came from the keyboard of Carsten +Haitzler. +@item scottish - Fake scottish (dwarven) accent filter. +@item scramble - Scramble the \"inner\" letters of each word in the input. +@item spammer - Turns honest text into something liable to be flagged as spam. +@item studly - Studly caps. +@item uniencode - Use glorious unicode to the fullest possible extent. +@item upside-down - Flips the text upside down. +@end enumerate +The GNU project hosts a similar collection of filters, the GNU talkfilters.") + (license ;see debian/copyright + (list license:gpl2+ ; most of the filters + license:gpl2 ; rasterman, ky00te.dir/* nethackify, pirate + license:gpl3+ ; scramble, scottish + license:public-domain ; jethro, kraut, ken, studly + license:gpl1+ ; cockney, jive, nyc only say "gpl" + license:expat))))) ; newspeak -- 2.23.0