From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id JDwsO+U7gV9qCAAA0tVLHw (envelope-from ) for ; Sat, 10 Oct 2020 04:43:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0BBwNuU7gV9uRgAAbx9fmQ (envelope-from ) for ; Sat, 10 Oct 2020 04:43:17 +0000 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 E533D940414 for ; Sat, 10 Oct 2020 04:43:16 +0000 (UTC) Received: from localhost ([::1]:46530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kR6iw-0002yg-G9 for larch@yhetil.org; Sat, 10 Oct 2020 00:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kR6ik-0002rh-T7 for guix-patches@gnu.org; Sat, 10 Oct 2020 00:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53448) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kR6ik-0000iB-Eq for guix-patches@gnu.org; Sat, 10 Oct 2020 00:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kR6ik-0005fV-Cw for guix-patches@gnu.org; Sat, 10 Oct 2020 00:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43899] [PATCH] gnu: emacs-counsel-projectile: Fix incompatibility. Resent-From: Joseph LaFreniere Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Oct 2020 04:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43899@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160230493921733 (code B ref -1); Sat, 10 Oct 2020 04:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Oct 2020 04:42:19 +0000 Received: from localhost ([127.0.0.1]:36761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kR6i2-0005eT-Vp for submit@debbugs.gnu.org; Sat, 10 Oct 2020 00:42:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:33614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kR6i0-0005eJ-1z for submit@debbugs.gnu.org; Sat, 10 Oct 2020 00:42:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kR6hz-0002H3-NL for guix-patches@gnu.org; Sat, 10 Oct 2020 00:42:15 -0400 Received: from mx.kolabnow.com ([95.128.36.42]:37926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kR6hx-0000Sk-3Z for guix-patches@gnu.org; Sat, 10 Oct 2020 00:42:15 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out001.mykolab.com (Postfix) with ESMTP id 21252E3E for ; Sat, 10 Oct 2020 06:42:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:mime-version:message-id:date:date :subject:subject:from:from:received:received:received; s= dkim20160331; t=1602304928; x=1604119329; bh=a9QZLBuZIuYyDj4OSL6 8K8bWSEpKHL6NqeEODanozYw=; b=0P5fqcNnAsTrjdj6StLJzJkD2Y23+fyMnIQ G7DdOLKaXOjWOTmAMwGkAP/5SyXuj2xCihLrFxZMIhyI79A0hAEmVtn7+VrFwpP5 2tzmQO8Ga0P77FioxNxOtee3tcIcqdvFJTemjKAxU0LMCiCmY6+xAnDL4wCyvPOr ap2oJ8XL5oErKgjDZfmQi5ZAwlM7IXd7vguR8pQjlBN3C6jN+0+MO71X+VT3srJB P8XdHQoDoQfZ1JiF6uivv9mzGkBCcGivYN0+polWPLz2wlUB/d/N7JpjEWKB0UFK Q7drpbsTGZoigmSZvDKXTXNlRajXZ5HQ7xfV8ppg0P+TgcEHWN9lACKM/lgDsDEQ n7LCrcsxNqzwlnMUZtIxUUfhV8UWa3db53jjZ6Ktyhx/1aexAFMEIA/4ETf/L4vx 0bEsP1pf7F5CWnK9YwiiRyH0nNnDm+1poaMWAdVzT1Nyn4z32/7dxzicimeKuHna 1zJWi8MEE7+DUcIEMILtZH3SgBqKDQqDoCVRXB7uPME/AlGjK/TVprhWIpe5aMjj ikTu4A6Qd9wYC3QiuBUo5YpI04znHVrErKPrSZYW77hp0KaqygZ7PDEWlP6sFGZ/ WXZ+jc7j6loXvcJ9GraxvOcJLC28JrBCgpPQh9MVNLh/FbU2gQ+IRIIy/CT85ySx irpLbxVI= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Score: -1.899 Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8O6AUyVpNi4E for ; Sat, 10 Oct 2020 06:42:08 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out001.mykolab.com (Postfix) with ESMTPS id 294FCA12 for ; Sat, 10 Oct 2020 06:42:07 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx003.mykolab.com (Postfix) with ESMTPS id B2867A1A for ; Sat, 10 Oct 2020 06:42:07 +0200 (CEST) From: Joseph LaFreniere Date: Fri, 09 Oct 2020 23:42:02 -0500 Message-ID: <87eem6u1yd.fsf@odyssey.lafreniere.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=95.128.36.42; envelope-from=joseph@lafreniere.xyz; helo=mx.kolabnow.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/10 00:42:09 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FROM_SUSPICIOUS_NTLD=0.497, FROM_SUSPICIOUS_NTLD_FP=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.1 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: 0.1 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=kolabnow.com header.s=dkim20160331 header.b=0P5fqcNn; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: eGCNK1sOs5DY --=-=-= Content-Type: text/plain; format=flowed The current recipe for emacs-counsel-projectile has errors when paired with the current recipe of emacs-counsel. This patch uses a later, untagged commit from the master branch of counsel-projectile that resolves the errors. Patch file is attached. -- Joseph LaFreniere --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-counsel-projectile-Fix-incompatibility.patch >From af4153b59d14544a4050a8da618f2cd8066c651b Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Mon, 5 Oct 2020 22:38:33 -0500 Subject: [PATCH] gnu: emacs-counsel-projectile: Fix incompatibility. * gnu/packages/emacs-xyz.scm (emacs-counsel-projectile): Fix incompatibility with packaged verison of emacs-counsel. --- gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 55f9f7cf4d..67cb7a0975 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7450,28 +7450,31 @@ asynchronously, with Counsel and Ivy. Simply call (license license:gpl3+)))) (define-public emacs-counsel-projectile - (package - (name "emacs-counsel-projectile") - (version "0.3.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ericdanan/counsel-projectile") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1k4n5lw6wwbgpwv0dg9dw0bjzi0hvbgkzrs1zmq36yhfz6y8gwnh")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-counsel" ,emacs-counsel) - ("emacs-projectile" ,emacs-projectile))) - (home-page "https://github.com/ericdanan/counsel-projectile") - (synopsis "Enhance Projectile with Ivy") - (description - "This package uses Ivy to provide additional actions for Projectile + (let ((commit "77392cbbc42e98fc137b43f1db1b111ba6e2dd75") + (tag "0.3.1") + (revision "1")) + (package + (name "emacs-counsel-projectile") + (version (git-version tag revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ericdanan/counsel-projectile") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "131pww7lf88az5bsnaza8i60p7xcic271wpdr870zan8z1jh69k3")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-counsel" ,emacs-counsel) + ("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/ericdanan/counsel-projectile") + (synopsis "Enhance Projectile with Ivy") + (description + "This package uses Ivy to provide additional actions for Projectile commands and replacements for existing functions.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-qml-mode (package -- 2.28.0 --=-=-=--