From 0e41f95eec4b1c4dc8a94de087c49c4adfbc9459 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 23 Jan 2019 08:52:59 +0100 Subject: [PATCH 01/11] gnu: wine: Update to 4.0. * gnu/packages/wine.scm (wine): Update to 4.0. [inputs]: Add sdl2 and vulkan-loader. * gnu/packages/wine.scm (wine-staging)[inputs]: Remove sdl2 and vulkan-loader, inherit from wine instead. --- gnu/packages/wine.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 3d16fac95f..45cc2d811b 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -71,7 +71,7 @@ (define-public wine (package (name "wine") - (version "3.0.4") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "https://dl.winehq.org/wine/source/" @@ -79,7 +79,7 @@ "/wine-" version ".tar.xz")) (sha256 (base32 - "037vlrk80lagy362w7500i2ldwvdwsadrknajzi67cvxpvnqhnnl")))) + "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) @@ -122,8 +122,10 @@ ("ncurses" ,ncurses) ("openal" ,openal) ("pulseaudio" ,pulseaudio) + ("sdl2" ,sdl2) ("unixodbc" ,unixodbc) ("v4l-utils" ,v4l-utils) + ("vulkan-loader" ,vulkan-loader) ("zlib" ,zlib))) (arguments `(;; Force a 32-bit build targeting a similar architecture, i.e.: @@ -288,10 +290,8 @@ integrate Windows applications into your desktop.") ("libva" ,libva) ("mesa" ,mesa) ("python" ,python) - ("sdl2" ,sdl2) ("util-linux" ,util-linux) ; for hexdump ("vkd3d" ,vkd3d) - ("vulkan-loader" ,vulkan-loader) ("wine-staging-patchset-data" ,wine-staging-patchset-data) ,@(package-inputs wine))) (arguments From 07725a0a66c4b98d815a25d7a78b53bf63492625 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 23 Jan 2019 09:13:28 +0100 Subject: [PATCH 02/11] gnu: wine-staging: Update to 4.0. * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 4.0. * gnu/packages/wine.scm (wine-staging): Update to 4.0. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 45cc2d811b..42bec5cca5 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -227,7 +227,7 @@ integrate Windows applications into your desktop.") (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "4.0-rc7") + (version "4.0") (source (origin (method git-fetch) @@ -237,7 +237,7 @@ integrate Windows applications into your desktop.") (file-name (git-file-name name version)) (sha256 (base32 - "16mfsa0hq7nw5ad1bsr4cn03avjdzgl8j07n5f26idk3zhlzym9d")))) + "1xfbmpjvzkgjg95x5d36raz3hp0qcdaim0n5hw9im0xjnwb83am9")))) (build-system trivial-build-system) (native-inputs `(("bash" ,bash) @@ -283,7 +283,7 @@ integrate Windows applications into your desktop.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1myq6707ba5p3bh7qr6k86rpkrpdi31py3v3n96bg184xs7h99yj")))) + "0k8d90mgjzv8vjspmnxzr3i5mbccxnbr9hf03q1bpf5jjppcsdk7")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf ("ffmpeg" ,ffmpeg) ("gtk+" ,gtk+) From 8b9fab8f764890d049350c3615f51ee825667402 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 09:38:33 +0200 Subject: [PATCH 03/11] gnu: emacs-git-modes: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-git-mode)[source]: Use 'git-fetch'. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a811e5315..fd5f84c6d2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -203,14 +203,14 @@ when typing parentheses directly or commenting out code line by line.") (name "emacs-git-modes") (version "1.2.8") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/git-modes/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/git-modes") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0h49f68yn0q4lg054adqii4qja1z2pzybm7nf4kvpq7fzjrzgv1q")))) + "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72")))) (build-system emacs-build-system) (home-page "https://github.com/magit/git-modes") (synopsis "Emacs major modes for Git configuration files") From daa82371b81af3e7333363f1ccc737e7929098ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 09:50:35 +0200 Subject: [PATCH 04/11] gnu: eamcs-magit-svm: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-magit-svn)[source]: Use 'git-fetch'. [native-inputs]: Remove tar, gzip. [arguments]: Adjust code accordingly. --- gnu/packages/emacs-xyz.scm | 48 ++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd5f84c6d2..ce0030e954 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -323,18 +323,16 @@ operations.") (name "emacs-magit-svn") (version "2.2.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/magit-svn/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-svn") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1c3n377v436zaxamlsz04y1ahdhp96x1vd43zaryv4y10m02ba47")))) + "128ra3habdqk1rsnmy87m0aw2pqi033dqmmjmgsmfblnfvi987p9")))) (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-minimal) - ("tar" ,tar) - ("gzip" ,gzip))) + (native-inputs `(("emacs" ,emacs-minimal))) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) ("magit" ,emacs-magit))) @@ -347,26 +345,20 @@ operations.") (use-modules (guix build utils) (guix build emacs-utils)) - (let* ((tar (string-append (assoc-ref %build-inputs "tar") - "/bin/tar")) - (PATH (string-append (assoc-ref %build-inputs "gzip") - "/bin")) - (emacs (string-append (assoc-ref %build-inputs "emacs") - "/bin/emacs")) - (magit (string-append (assoc-ref %build-inputs "magit") - "/share/emacs/site-lisp")) - (dash (string-append (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash))) - (with-editor (string-append (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) - (source (assoc-ref %build-inputs "source")) - (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - (setenv "PATH" PATH) - (invoke tar "xvf" source) + (let ((emacs (string-append (assoc-ref %build-inputs "emacs") + "/bin/emacs")) + (magit (string-append (assoc-ref %build-inputs "magit") + "/share/emacs/site-lisp")) + (dash (string-append (assoc-ref %build-inputs "dash") + "/share/emacs/site-lisp/guix.d/dash-" + ,(package-version emacs-dash))) + (with-editor (string-append (assoc-ref %build-inputs "with-editor") + "/share/emacs/site-lisp/guix.d/with-editor-" + ,(package-version emacs-with-editor))) + (source (assoc-ref %build-inputs "source")) + (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - (install-file (string-append "magit-svn-" ,version "/magit-svn.el") + (install-file (string-append source "/magit-svn.el") lisp-dir) (with-directory-excursion lisp-dir From ff1d5478a157dfef2f1d91b2b097ca3d5256d3a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:02:11 +0200 Subject: [PATCH 05/11] gnu: emacs-magit-svn: Add missing inputs. * gnu/packages/emacs-xyz.scm (emacs-magit-svn)[propagated-inputs]: Add emacs-ghub, emacs-magit-popup. [arguments]: Adjust accordingly. --- gnu/packages/emacs-xyz.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ce0030e954..fcfd6d7dc2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -334,8 +334,10 @@ operations.") (build-system trivial-build-system) (native-inputs `(("emacs" ,emacs-minimal))) (propagated-inputs `(("dash" ,emacs-dash) + ("ghub" ,emacs-ghub) ("with-editor" ,emacs-with-editor) - ("magit" ,emacs-magit))) + ("magit" ,emacs-magit) + ("magit-popup" ,emacs-magit-popup))) (arguments `(#:modules ((guix build utils) (guix build emacs-utils)) @@ -349,6 +351,12 @@ operations.") "/bin/emacs")) (magit (string-append (assoc-ref %build-inputs "magit") "/share/emacs/site-lisp")) + (magit-popup (string-append (assoc-ref %build-inputs "magit-popup") + "/share/emacs/site-lisp/guix.d/magit-popup-" + ,(package-version emacs-magit-popup))) + (ghub (string-append (assoc-ref %build-inputs "ghub") + "/share/emacs/site-lisp/guix.d/ghub-" + ,(package-version emacs-ghub))) (dash (string-append (assoc-ref %build-inputs "dash") "/share/emacs/site-lisp/guix.d/dash-" ,(package-version emacs-dash))) @@ -365,7 +373,8 @@ operations.") (parameterize ((%emacs emacs)) (emacs-generate-autoloads ,name lisp-dir) (setenv "EMACSLOADPATH" - (string-append ":" magit ":" dash ":" with-editor)) + (string-append ":" magit ":" magit-popup ":" ghub ":" + dash ":" with-editor)) (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) #t)))) (home-page "https://github.com/magit/magit-svn") From 427530b96d6061c7f68949deaa3343f35a558078 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:04:10 +0200 Subject: [PATCH 06/11] gnu: emacs-magit-svn: Update to 2.2.1. * gnu/packages/emacs-xyz.scm (emacs-magit-svn): Update to 2.2.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fcfd6d7dc2..640ef2b4d7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -321,7 +321,7 @@ operations.") (define-public emacs-magit-svn (package (name "emacs-magit-svn") - (version "2.2.0") + (version "2.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -330,7 +330,7 @@ operations.") (file-name (git-file-name name version)) (sha256 (base32 - "128ra3habdqk1rsnmy87m0aw2pqi033dqmmjmgsmfblnfvi987p9")))) + "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9")))) (build-system trivial-build-system) (native-inputs `(("emacs" ,emacs-minimal))) (propagated-inputs `(("dash" ,emacs-dash) From 0c662875b9c220f81b734daa9a78c4cae2ea7b52 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:07:28 +0200 Subject: [PATCH 07/11] gnu: emacs-ghub: Don't use unstable-tarball. * gnu/packages/emacs-xyz.scm (emacs-ghub)[source]: Use 'git-fetch'. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 640ef2b4d7..12d8137076 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -477,14 +477,14 @@ deliver data to mobile and web apps.") (name "emacs-ghub") (version "2.0.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/ghub/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/ghub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0d0qj5r1bm2aidi61rigrdaycxnyb7y1ivb3h8rpvvapsf8sk7z0")))) + "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y")))) (build-system emacs-build-system) (arguments `(#:phases From f5350a07dc1556a8d8e06dc0e316bd8d0f5bc6fa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:35:29 +0200 Subject: [PATCH 08/11] gnu: emacs-haskell-mode: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode)[source]: Use 'git-fetch'. --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 12d8137076..2897099d0f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -535,13 +535,13 @@ for editing Racket's Scribble documentation syntax in Emacs.") (name "emacs-haskell-mode") (version "16.1") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.gz")) - (uri (string-append - "https://github.com/haskell/haskell-mode/archive/v" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0g6lcjw7lcgavv3yrd8xjcyqgfyjl787y32r1z14amw2f009m78h")) + (base32 "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq")) (patches (search-patches ; backport test failure fixes "haskell-mode-unused-variables.patch" From d49d05342889f3a28c10bdc7d752835058b80309 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:38:19 +0200 Subject: [PATCH 09/11] gnu: emacs-magit: Update to 2.13.1. * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 2.13.1. [source]: Use 'git-fetch'. --- gnu/packages/emacs-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2897099d0f..fce56ea517 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -250,15 +250,16 @@ on stdout instead of using a socket as the Emacsclient does.") (define-public emacs-magit (package (name "emacs-magit") - (version "2.13.0") + (version "2.13.1") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/magit/magit/releases/download/" - version "/magit-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1ygaah3dd3nxpyd17297xgvdcgr7pgzzwlmpnmchki0kiwgg3sbc")))) + "1kmjjcvhcb21qi6kmrlhf92ync8va5l41n9ban8kj25h7dbqyiym")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) From ae848798a6d83abdaa48384f4edd252d038ad4d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:45:06 +0200 Subject: [PATCH 10/11] gnu: emacs-ghub: Update to 3.2.0. * gnu/packages/emacs-xyz.scm (emacs-ghub): Update to 3.2.0. [propagated-inputs]: Add emacs-dash, emacs-graphql, emacs-treepy. [synopsis, description]: Update. (emacs-magit, emacs-magit-svn)[propagated-inputs]: Add emacs-graphql, emacs-treepy. [arguments]: Update accordingly. --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fce56ea517..29cfcd8d7c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -269,6 +269,8 @@ on stdout instead of using a socket as the Emacsclient does.") (propagated-inputs `(("dash" ,emacs-dash) ("ghub" ,emacs-ghub) + ("graphql" ,emacs-graphql) + ("treepy" ,emacs-treepy) ("magit-popup" ,emacs-magit-popup) ("with-editor" ,emacs-with-editor))) (arguments @@ -287,6 +289,14 @@ on stdout instead of using a socket as the Emacsclient does.") (assoc-ref %build-inputs "ghub") "/share/emacs/site-lisp/guix.d/ghub-" ,(package-version emacs-ghub)) + (string-append "GRAPHQL_DIR=" + (assoc-ref %build-inputs "graphql") + "/share/emacs/site-lisp/guix.d/graphql-" + ,(package-version emacs-graphql)) + (string-append "TREEPY_DIR=" + (assoc-ref %build-inputs "treepy") + "/share/emacs/site-lisp/guix.d/treepy-" + ,(package-version emacs-treepy)) (string-append "MAGIT_POPUP_DIR=" (assoc-ref %build-inputs "magit-popup") "/share/emacs/site-lisp/guix.d/magit-popup-" @@ -336,6 +346,8 @@ operations.") (native-inputs `(("emacs" ,emacs-minimal))) (propagated-inputs `(("dash" ,emacs-dash) ("ghub" ,emacs-ghub) + ("graphql" ,emacs-graphql) + ("treepy" ,emacs-treepy) ("with-editor" ,emacs-with-editor) ("magit" ,emacs-magit) ("magit-popup" ,emacs-magit-popup))) @@ -358,6 +370,12 @@ operations.") (ghub (string-append (assoc-ref %build-inputs "ghub") "/share/emacs/site-lisp/guix.d/ghub-" ,(package-version emacs-ghub))) + (graphql (string-append (assoc-ref %build-inputs "graphql") + "/share/emacs/site-lisp/guix.d/graphql-" + ,(package-version emacs-graphql))) + (treepy (string-append (assoc-ref %build-inputs "treepy") + "/share/emacs/site-lisp/guix.d/treepy-" + ,(package-version emacs-treepy))) (dash (string-append (assoc-ref %build-inputs "dash") "/share/emacs/site-lisp/guix.d/dash-" ,(package-version emacs-dash))) @@ -375,7 +393,7 @@ operations.") (emacs-generate-autoloads ,name lisp-dir) (setenv "EMACSLOADPATH" (string-append ":" magit ":" magit-popup ":" ghub ":" - dash ":" with-editor)) + ":" graphql ":" treepy ":" dash ":" with-editor)) (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) #t)))) (home-page "https://github.com/magit/magit-svn") @@ -476,7 +494,7 @@ deliver data to mobile and web apps.") (define-public emacs-ghub (package (name "emacs-ghub") - (version "2.0.1") + (version "3.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -485,7 +503,7 @@ deliver data to mobile and web apps.") (file-name (git-file-name name version)) (sha256 (base32 - "1b5jrpj3z989r3mf4jfch8rnaaa5hyb2395xz3v37f0vsphd7s0y")))) + "0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl")))) (build-system emacs-build-system) (arguments `(#:phases @@ -495,13 +513,17 @@ deliver data to mobile and web apps.") (invoke "make" "info")))))) (native-inputs `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash) + ("graphql" ,emacs-graphql) + ("treepy" ,emacs-treepy))) (home-page "https://github.com/magit/ghub") - (synopsis "Emacs client library for Github API and Gitlab API") + (synopsis "Emacs client libraries for the APIs of various Git forges") (description - "This package provides 2 files: @file{ghub.el} and @file{glab.el}, -which are the libraries that provide basic support for using the Github and -Gitlab APIs from Emacs packages. It abstracts access to API resources using -only a handful of functions that are not resource-specific.") + "Ghub provides basic support for using the APIs of various Git forges from +Emacs packages. It supports the REST APIs of Github, Github GraphQL, Gitlab, +Gitea, Gogs and Bitbucket. It abstracts access to API resources using only a +handful of functions that are not resource-specific.") (license license:gpl3+))) (define-public emacs-scribble-mode From b2c08402f52b1f80d1c03ce207b596655bbe3cbd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Jan 2019 10:50:31 +0200 Subject: [PATCH 11/11] gnu: emacs-emms-mode-line-cycle: Don't use unstable tarball. * gnu/packages/emacs-xyz.scm (emacs-emms-mode-line-cycle)[source]: Use 'git-fetch'. --- gnu/packages/emacs-xyz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 29cfcd8d7c..02e227d42d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1021,13 +1021,14 @@ light user interface.") (version "0.2.5") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/momomo5717/emms-mode-line-cycle" - "/archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/momomo5717/emms-mode-line-cycle") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ifszi930pnaxk1x8pcydmvnp06868gc7nfx14q17zbajbx735k6")))) + "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp")))) (build-system emacs-build-system) (propagated-inputs `(("emms" ,emacs-emms)))