* [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch.
@ 2019-10-22 3:16 Stephen Webber
2019-10-28 14:45 ` Mathieu Othacehe
2019-10-29 1:46 ` [bug#37863] [PATCH v2] gnu: emacs-helm-projectile: Update package Stephen Webber
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Webber @ 2019-10-22 3:16 UTC (permalink / raw)
To: 37863; +Cc: Stephen Webber
* gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Apply patch.
* gnu/packages/patches/emacs-helm-projectile-require-dash.patch: New file.
---
gnu/packages/emacs-xyz.scm | 4 +++-
.../emacs-helm-projectile-require-dash.patch | 13 +++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/emacs-helm-projectile-require-dash.patch
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8c3c50efdc..5ed2cf67bc 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6967,7 +6967,9 @@ as well as features for editing search results.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))))
+ (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))
+ (patches
+ (search-patches "emacs-helm-projectile-require-dash.patch"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-dash" ,emacs-dash)
diff --git a/gnu/packages/patches/emacs-helm-projectile-require-dash.patch b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
new file mode 100644
index 0000000000..9da3deff50
--- /dev/null
+++ b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
@@ -0,0 +1,13 @@
+Make dash dependency explicit - this issue is resolved in master and is
+documented at https://github.com/bbatsov/helm-projectile/issues/120
+
+--- a/helm-projectile.el
++++ b/helm-projectile.el
+@@ -41,6 +41,7 @@
+
+ (require 'projectile)
+ (require 'cl-lib)
++(require 'dash)
+ (require 'grep)
+ (require 'helm)
+ (require 'helm-types)
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch.
2019-10-22 3:16 [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch Stephen Webber
@ 2019-10-28 14:45 ` Mathieu Othacehe
2019-10-29 0:06 ` Stephen Webber
2019-10-29 1:46 ` [bug#37863] [PATCH v2] gnu: emacs-helm-projectile: Update package Stephen Webber
1 sibling, 1 reply; 5+ messages in thread
From: Mathieu Othacehe @ 2019-10-28 14:45 UTC (permalink / raw)
To: 37863; +Cc: montokapro
Hello Stephen,
As this project seems unmaintained and the last release was in 2016, I
think the best option would be to package a 0.14.0-1 based on
helm-projectile last commit.
Thanks,
Mathieu
Stephen Webber writes:
> * gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Apply patch.
> * gnu/packages/patches/emacs-helm-projectile-require-dash.patch: New file.
> ---
> gnu/packages/emacs-xyz.scm | 4 +++-
> .../emacs-helm-projectile-require-dash.patch | 13 +++++++++++++
> 2 files changed, 16 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/emacs-helm-projectile-require-dash.patch
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 8c3c50efdc..5ed2cf67bc 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -6967,7 +6967,9 @@ as well as features for editing search results.")
> (commit (string-append "v" version))))
> (file-name (git-file-name name version))
> (sha256
> - (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))))
> + (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))
> + (patches
> + (search-patches "emacs-helm-projectile-require-dash.patch"))))
> (build-system emacs-build-system)
> (propagated-inputs
> `(("emacs-dash" ,emacs-dash)
> diff --git a/gnu/packages/patches/emacs-helm-projectile-require-dash.patch b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> new file mode 100644
> index 0000000000..9da3deff50
> --- /dev/null
> +++ b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> @@ -0,0 +1,13 @@
> +Make dash dependency explicit - this issue is resolved in master and is
> +documented at https://github.com/bbatsov/helm-projectile/issues/120
> +
> +--- a/helm-projectile.el
> ++++ b/helm-projectile.el
> +@@ -41,6 +41,7 @@
> +
> + (require 'projectile)
> + (require 'cl-lib)
> ++(require 'dash)
> + (require 'grep)
> + (require 'helm)
> + (require 'helm-types)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch.
2019-10-28 14:45 ` Mathieu Othacehe
@ 2019-10-29 0:06 ` Stephen Webber
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Webber @ 2019-10-29 0:06 UTC (permalink / raw)
To: Mathieu Othacehe; +Cc: 37863
[-- Attachment #1: Type: text/plain, Size: 2370 bytes --]
Mathieu,
Great! I chose this PR because I wanted to learn when patching was deemed
appropriate. Thank you for the suggestion.
On Mon, Oct 28, 2019 at 2:45 PM Mathieu Othacehe <m.othacehe@gmail.com>
wrote:
>
> Hello Stephen,
>
> As this project seems unmaintained and the last release was in 2016, I
> think the best option would be to package a 0.14.0-1 based on
> helm-projectile last commit.
>
> Thanks,
>
> Mathieu
>
> Stephen Webber writes:
>
> > * gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Apply patch.
> > * gnu/packages/patches/emacs-helm-projectile-require-dash.patch: New
> file.
> > ---
> > gnu/packages/emacs-xyz.scm | 4 +++-
> > .../emacs-helm-projectile-require-dash.patch | 13 +++++++++++++
> > 2 files changed, 16 insertions(+), 1 deletion(-)
> > create mode 100644
> gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> >
> > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> > index 8c3c50efdc..5ed2cf67bc 100644
> > --- a/gnu/packages/emacs-xyz.scm
> > +++ b/gnu/packages/emacs-xyz.scm
> > @@ -6967,7 +6967,9 @@ as well as features for editing search results.")
> > (commit (string-append "v" version))))
> > (file-name (git-file-name name version))
> > (sha256
> > - (base32
> "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))))
> > + (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))
> > + (patches
> > + (search-patches "emacs-helm-projectile-require-dash.patch"))))
> > (build-system emacs-build-system)
> > (propagated-inputs
> > `(("emacs-dash" ,emacs-dash)
> > diff --git
> a/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> > new file mode 100644
> > index 0000000000..9da3deff50
> > --- /dev/null
> > +++ b/gnu/packages/patches/emacs-helm-projectile-require-dash.patch
> > @@ -0,0 +1,13 @@
> > +Make dash dependency explicit - this issue is resolved in master and is
> > +documented at https://github.com/bbatsov/helm-projectile/issues/120
> > +
> > +--- a/helm-projectile.el
> > ++++ b/helm-projectile.el
> > +@@ -41,6 +41,7 @@
> > +
> > + (require 'projectile)
> > + (require 'cl-lib)
> > ++(require 'dash)
> > + (require 'grep)
> > + (require 'helm)
> > + (require 'helm-types)
>
>
[-- Attachment #2: Type: text/html, Size: 3225 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#37863] [PATCH v2] gnu: emacs-helm-projectile: Update package.
2019-10-22 3:16 [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch Stephen Webber
2019-10-28 14:45 ` Mathieu Othacehe
@ 2019-10-29 1:46 ` Stephen Webber
2019-10-29 8:27 ` bug#37863: " Mathieu Othacehe
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Webber @ 2019-10-29 1:46 UTC (permalink / raw)
To: 37863; +Cc: Stephen Webber
* gnu/packages/emacs-xyz.scm (emacs-helm-projectile): Update package.
---
gnu/packages/emacs-xyz.scm | 48 +++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0ce8739a77..67f9c8c3be 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -6955,29 +6955,33 @@ for search-based navigation of buffers.")
as well as features for editing search results.")
(license license:gpl3+))))
+;; There hasn't been a tag or release since 2016, so we take the latest
+;; commit.
(define-public emacs-helm-projectile
- (package
- (name "emacs-helm-projectile")
- (version "0.14.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bbatsov/helm-projectile.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"))))
- (build-system emacs-build-system)
- (propagated-inputs
- `(("emacs-dash" ,emacs-dash)
- ("emacs-helm" ,emacs-helm)
- ("emacs-projectile" ,emacs-projectile)))
- (home-page "https://github.com/bbatsov/helm-projectile")
- (synopsis "Helm integration for Projectile")
- (description
- "This Emacs library provides a Helm interface for Projectile.")
- (license license:gpl3+)))
+ (let ((commit "5328b74dddcee8d1913803ca8167868831a07463")
+ (version "0.14.0")
+ (revision "1"))
+ (package
+ (name "emacs-helm-projectile")
+ (version (git-version version revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bbatsov/helm-projectile.git")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0a811cblrvc8llpv771b8dppgxs6bwjyvjy3qn2xns4nigvn93s0"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ `(("emacs-helm" ,emacs-helm)
+ ("emacs-projectile" ,emacs-projectile)))
+ (home-page "https://github.com/bbatsov/helm-projectile")
+ (synopsis "Helm integration for Projectile")
+ (description
+ "This Emacs library provides a Helm interface for Projectile.")
+ (license license:gpl3+))))
(define-public emacs-taskrunner
(let ((commit "3afd4a546d42339543d3d4e51b175fc3e82b3358")
--
2.23.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#37863: [PATCH v2] gnu: emacs-helm-projectile: Update package.
2019-10-29 1:46 ` [bug#37863] [PATCH v2] gnu: emacs-helm-projectile: Update package Stephen Webber
@ 2019-10-29 8:27 ` Mathieu Othacehe
0 siblings, 0 replies; 5+ messages in thread
From: Mathieu Othacehe @ 2019-10-29 8:27 UTC (permalink / raw)
To: guix-patches; +Cc: 37863-done, Stephen Webber
Pushed, thanks :)
Mathieu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-29 8:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-22 3:16 [bug#37863] [PATCH] gnu: emacs-helm-projectile: Apply patch Stephen Webber
2019-10-28 14:45 ` Mathieu Othacehe
2019-10-29 0:06 ` Stephen Webber
2019-10-29 1:46 ` [bug#37863] [PATCH v2] gnu: emacs-helm-projectile: Update package Stephen Webber
2019-10-29 8:27 ` bug#37863: " Mathieu Othacehe
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).