From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IMxPGSkS3GK5SQAAbAwnHQ (envelope-from ) for ; Sat, 23 Jul 2022 17:22:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id sA5BGSkS3GLcSgEA9RJhRA (envelope-from ) for ; Sat, 23 Jul 2022 17:22:17 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id ECB913D401 for ; Sat, 23 Jul 2022 17:22:16 +0200 (CEST) Received: from localhost ([::1]:56756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFGxL-0005Nj-PW for larch@yhetil.org; Sat, 23 Jul 2022 11:22:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFGx9-0004yP-0N for bug-guix@gnu.org; Sat, 23 Jul 2022 11:22:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56314) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFGx8-0004eI-Nf for bug-guix@gnu.org; Sat, 23 Jul 2022 11:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFGx8-0007kV-JB for bug-guix@gnu.org; Sat, 23 Jul 2022 11:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#54691: [PATCH 3/5] gnu: Remove fortune-mod. References: <3fc3794df2d837c16ce768594c3ea9086b5f0abf.camel@telenet.be> In-Reply-To: <3fc3794df2d837c16ce768594c3ea9086b5f0abf.camel@telenet.be> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 23 Jul 2022 15:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54691 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Maxime Devos Cc: 54691@debbugs.gnu.org Received: via spool by 54691-submit@debbugs.gnu.org id=B54691.165858970529729 (code B ref 54691); Sat, 23 Jul 2022 15:22:02 +0000 Received: (at 54691) by debbugs.gnu.org; 23 Jul 2022 15:21:45 +0000 Received: from localhost ([127.0.0.1]:46057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFGwq-0007jK-GY for submit@debbugs.gnu.org; Sat, 23 Jul 2022 11:21:45 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:44630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFGwf-0007iO-DJ for 54691@debbugs.gnu.org; Sat, 23 Jul 2022 11:21:34 -0400 Received: by mail-ej1-f67.google.com with SMTP id ss3so13157370ejc.11 for <54691@debbugs.gnu.org>; Sat, 23 Jul 2022 08:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=01S9RzJRfo5kRJvIj8xKHlcgoSYtfnwjZnY2KQCP2X8=; b=fRpQ4eVhrc+ANFIx/C5x7hNjZnht0QDNCtLAIX/68oTfhot4aSmzn4B2JA77yCMwmI cK39oZrMo1NHgYMs6OxHWQXVb1vq1Rx9b5G3pjzav5rIAWmvBLD6oYi219IDmtQoJBSe Y+oAD71CXQ9H0c3x5+s5ZWAp3aGnlTiW4gN7D2LgvZnnNzbKLtcgRXSGi2Q6GZ6qBAen wfYp7Iu/19cxq1nE52hq/+TI3IvOoWHDIGHUDycNPNgJX0NgPx8gZsg0uPiTi3kb8J6e 2OeWDerVLaDeIAGqVD1FFx0qTf1F9Cy04o8h81/CYLLi67yS/bKwNGLYieh1apUNvZHi zUIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=01S9RzJRfo5kRJvIj8xKHlcgoSYtfnwjZnY2KQCP2X8=; b=tW0F3ux6cWR/3rRADSMWNvp9MZvvJWpWghnmqX+JD/rlffVfGK1YSuMUspX6sSN6Ek k1fC4iXN89xlVLYF9zbwtsJOuAkYv7YCKAmEuZqm11Cg82GhfiCma1ncvUVUo+FZRN0B F6J8FoeyNKEvWtUrOKRoZAe6Bdb+8DNP3YvKi7v1GxQbPaGphBIr5JbUr4BD2z0QvQtf Xkt2DF7XGsONc2xX00PLXixr2WmTVlPwHgxDcVfb5RSmy+T/Oy34Lo7WzslueCjbd89c z3GTX8jtzjaA2Tq56SB/AIgETsSmpERGIQm8Lcw2mjFIbXymut/Sq+DvA8+7i8vHrpe1 fprQ== X-Gm-Message-State: AJIora+Ufm406oeObmDlGZjmBOT3Z64up9+L0L3NC6eG7dQkBoctSean iDmeJoBvptGLHeC6xg25Ak1tiZke1Ys= X-Google-Smtp-Source: AGRyM1vMm9tiX68TgKmOKliAKiIwxFo+uiaxCsYe9ZGSMW71tgI8UvUjKOmy0DWU32Hg/UEbkbCJbg== X-Received: by 2002:a17:906:8477:b0:72b:3e65:55c5 with SMTP id hx23-20020a170906847700b0072b3e6555c5mr3653626ejc.255.1658589687825; Sat, 23 Jul 2022 08:21:27 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id we10-20020a170907234a00b006fec4ee28d0sm3253293ejb.189.2022.07.23.08.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jul 2022 08:21:27 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 23 Jul 2022 17:13:41 +0200 Content-Transfer-Encoding: 7bit Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658589737; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=01S9RzJRfo5kRJvIj8xKHlcgoSYtfnwjZnY2KQCP2X8=; b=B/2Pjtu5/BUVGYV1grOgmUICDmyU7+mrvggC8lVXI9Or3Gw/epg6DjcKVB70V2OwoPP0Ic K4ys/0crXIibLzzhN2zGCzbrDqApxmXPfd2iUIarojFwL0kJEXdgudw9O5VGu+RdW5WkHd aylA+6pCYG9WPe6SwiI0c2jfnj299Ixef9RS3OAuQ1gJszAtDsglcPX8GvF0GwOowr7EcF 5+BDFRJIFqxwak7w6RKN/6d5JEuL0/LpvKUA78l8qdBBKO6OYAUDyosn/Hm2VZSeTNoboE CQZNBis3n0NEgC7vdq/WKbQZ2WmKUwjLyeV0328whegqumnPOscpCFDz5SvW1A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658589737; a=rsa-sha256; cv=none; b=SiC+i3dTUtsD0jhuxdOXpA44MJXFPbhm1JyObDmn9PgvplAZsuAz3GzfiUyFotc+1tlbRi ys62eVjIB01EoeWuIBHro4199yDQ8XE33uBqckccSAXnFKdRRMjTECg2RQWGiZaHzEVT0W A18wBLzkCa13cTeHvKJBdMAmAjJpWbe3GVD1LwY4Xjbd2X3tbEMUtaC8zNeqDfK17siRR1 3/+Gxl+Xw6qqT1uipFnpwTFkpURICNxJZ8TPzgEdjdA17pR4XYx0vyR38Hbg1ChvjqrdEr zVYViOuUNEDAQdZF7DiTIHXkRwDbeTOst5hOKUS6TSotW2eeT17eWi0OjO8JcA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fRpQ4eVh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=fRpQ4eVh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: ECB913D401 X-Spam-Score: 4.97 X-Migadu-Scanner: scn0.migadu.com X-TUID: /IxXvsHpgAFV * gnu/packages/games.scm (fortune-mod): Delete variable. * gnu/packages/toys.scm (fortune-mod): Add deprecated package alias. --- gnu/packages/games.scm | 73 ------------------------------------------ gnu/packages/toys.scm | 3 ++ 2 files changed, 3 insertions(+), 73 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d55a2ee867..4110ea99d1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7629,79 +7629,6 @@ (define-public rinutils (description "This package provides C11 / gnu11 utilities C library") (license license:expat))) -(define-public fortune-mod - (package - (name "fortune-mod") - (version "3.14.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/shlomif/fortune-mod") - (commit (string-append "fortune-mod-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1f2zif3s6vddbhph4jr1cymdsn7gagg59grrxs0yap6myqmy8shg")))) - (build-system cmake-build-system) - (arguments - (list #:configure-flags - #~(let ((fortunes (string-append #$output "/share/fortunes"))) - (list (string-append "-DLOCALDIR=" fortunes) - (string-append "-DLOCALODIR=" fortunes "/off") - (string-append "-DCOOKIEDIR=" fortunes) - (string-append "-DOCOOKIEDIR=" fortunes "/off"))) - #:test-target "check" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'enter-build-directory - (lambda _ - (chdir "fortune-mod"))) - (add-after 'enter-build-directory 'symlink-rinutils - (lambda _ - (mkdir-p "rinutils") - (symlink #$(this-package-native-input "rinutils") - "rinutils/rinutils"))) - (add-after 'enter-build-directory 'copy-cmake-modules - (lambda _ - (copy-file #$shlomif-cmake-modules - (string-append "cmake/" - (strip-store-file-name - #$shlomif-cmake-modules))))) - (add-after 'enter-build-directory 'delete-failing-test - (lambda _ - ;; TODO: Valgrind tests fail for some reason. Similar issue? - ;; https://github.com/shlomif/fortune-mod/issues/21 - (delete-file "tests/data/valgrind.t") - (with-output-to-file "tests/scripts/split-valgrind.pl" - (const #t)))) - (add-after 'install 'fix-install-directory - ;; Move fortune from "games/" to "bin/" and remove the - ;; former. This is easier than patching CMakeLists.txt - ;; since the tests hard-code the location as well. - (lambda _ - (with-directory-excursion #$output - (rename-file "games/fortune" "bin/fortune") - (rmdir "games"))))))) - (inputs (list recode)) - (native-inputs - (list perl - ;; For generating the documentation. - docbook-xml-5 - docbook-xsl - perl-app-xml-docbook-builder - ;; The following are only needed for tests. - perl-file-find-object - perl-test-differences - perl-class-xsaccessor - perl-io-all - perl-test-runvalgrind - rinutils)) - (home-page "https://www.shlomifish.org/open-source/projects/fortune-mod/") - (synopsis "The Fortune Cookie program from BSD games") - (description "Fortune is a command-line utility which displays a random -quotation from a collection of quotes.") - (license license:bsd-4))) - (define xonotic-data (package (name "xonotic-data") diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 556f196a55..2492a32d81 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -118,6 +118,9 @@ (define-public fortunes-jkirchartz from sources all around the world.") (license license:unlicense)))) +(define-public fortune-mod + (deprecated-package "fortune-mod" fortunes-jkirchartz)) + (define-public lolcat (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154") (revision "0")) -- 2.37.0