diff --git a/rekahsoft-gnu/packages/emacs-xyz.scm b/rekahsoft-gnu/packages/emacs-xyz.scm index ec116e7..13f7ca7 100644 --- a/rekahsoft-gnu/packages/emacs-xyz.scm +++ b/rekahsoft-gnu/packages/emacs-xyz.scm @@ -17,7 +17,8 @@ ;;; . (define-module (rekahsoft-gnu packages emacs-xyz) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -44,24 +45,20 @@ (package (name "emacs-helm-tramp") (version "1.3.9") - (source - (origin - (method url-fetch) - (uri (string-append - "https://stable.melpa.org/packages/helm-tramp-" - version - ".el")) - (sha256 - (base32 - "1nhlfq113ngcb74n76z8c2wnki14vls18mml36iwi8y9k63flkcd")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://stable.melpa.org/packages/helm-tramp-" version + ".el")) + (sha256 + (base32 + "1nhlfq113ngcb74n76z8c2wnki14vls18mml36iwi8y9k63flkcd")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) - (home-page - "https://github.com/masasam/emacs-helm-tramp") - (synopsis - "Tramp helm interface for ssh, docker, vagrant") + (home-page "https://github.com/masasam/emacs-helm-tramp") + (synopsis "Tramp helm interface for ssh, docker, vagrant") (description - "Provides interfaces of Tramp. + "Provides interfaces of Tramp. You can also use tramp with helm interface as root If you use it with docker-tramp, you can also use docker with helm interface If you use it with vagrant-tramp, you can also use vagrant with helm interface @@ -72,22 +69,18 @@ If you use it with vagrant-tramp, you can also use vagrant with helm interface (package (name "emacs-rebox2") (version "20121113.1300") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/rebox2-" - version - ".el")) - (sha256 - (base32 - "0ji5x2hnjklz9y4jd11hcfncbcfzgq1dg8r3s7dkrf696y4ziwwy")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/rebox2-" version + ".el")) + (sha256 + (base32 + "0ji5x2hnjklz9y4jd11hcfncbcfzgq1dg8r3s7dkrf696y4ziwwy")))) (build-system emacs-build-system) (home-page "https://github.com/lewang/rebox2") - (synopsis - "Inserting and modification of comment boxes in various styles") + (synopsis "Inserting and modification of comment boxes in various styles") (description - "Rebox2 provides major and minor modes for inserting and modification of + "Rebox2 provides major and minor modes for inserting and modification of comment box is various text styles.") (license #f))) @@ -96,23 +89,18 @@ comment box is various text styles.") (package (name "emacs-ibuffer-vc") (version "20181225.2227") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/ibuffer-vc-" - version - ".el")) - (sha256 - (base32 - "16nry1631g4draqh09r2rq92xpv5vsyxx9yd7r5i2m6kblqh4y3f")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/ibuffer-vc-" + version ".el")) + (sha256 + (base32 + "16nry1631g4draqh09r2rq92xpv5vsyxx9yd7r5i2m6kblqh4y3f")))) (build-system emacs-build-system) - (home-page - "https://github.com/purcell/ibuffer-vc") - (synopsis - "Group ibuffer's list by VC project, or show VC status") + (home-page "https://github.com/purcell/ibuffer-vc") + (synopsis "Group ibuffer's list by VC project, or show VC status") (description - "Adds functionality to ibuffer for grouping buffers by their parent + "Adds functionality to ibuffer for grouping buffers by their parent vc root directory, and for displaying and/or sorting by the vc status of listed files. ") @@ -123,22 +111,19 @@ status of listed files. (package (name "emacs-highlight-indent-guides") (version "20190108.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/highlight-indent-guides-" - version - ".el")) - (sha256 - (base32 - "02imngb4y6f9vp4jxiwdbdcjxllvjwaa2rlh61zy49n2wivrlwh0")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://melpa.org/packages/highlight-indent-guides-" + version ".el")) + (sha256 + (base32 + "02imngb4y6f9vp4jxiwdbdcjxllvjwaa2rlh61zy49n2wivrlwh0")))) (build-system emacs-build-system) - (home-page - "https://github.com/DarthFennec/highlight-indent-guides") + (home-page "https://github.com/DarthFennec/highlight-indent-guides") (synopsis "Minor mode to highlight indentation") (description - "This minor mode highlights indentation levels via font-lock. Indent widths + "This minor mode highlights indentation levels via font-lock. Indent widths are dynamically discovered, which means this correctly highlights in any mode, regardless of indent width, even in languages with non-uniform indentation such as Haskell. This mode works properly around hard tabs and @@ -149,22 +134,18 @@ mixed indentation, and it behaves well in large buffers.") (package (name "emacs-intel-hex-mode") (version "20180423.31") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/intel-hex-mode-" - version - ".el")) - (sha256 - (base32 - "1nvwjk686wna96srk3y9xniixas729x6m1rcjnc8lz1zkap9z9bv")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/intel-hex-mode-" + version ".el")) + (sha256 + (base32 + "1nvwjk686wna96srk3y9xniixas729x6m1rcjnc8lz1zkap9z9bv")))) (build-system emacs-build-system) - (home-page - "https://github.com/mschuldt/intel-hex-mode") + (home-page "https://github.com/mschuldt/intel-hex-mode") (synopsis "Mode for Intel Hex files") (description - "Use this mode for editing files in the intel hex format. The + "Use this mode for editing files in the intel hex format. The intel-hex-mode will do font locking, and calculate checksums.") (license license:gpl2))) @@ -172,22 +153,19 @@ intel-hex-mode will do font locking, and calculate checksums.") (package (name "emacs-highlight-parentheses") (version "20180704.1102") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/highlight-parentheses-" - version - ".el")) - (sha256 - (base32 - "0dxnw7d966pm44a54rmd40vrrps56jaayrc8wwj7wxl2imdzqzbl")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://melpa.org/packages/highlight-parentheses-" + version ".el")) + (sha256 + (base32 + "0dxnw7d966pm44a54rmd40vrrps56jaayrc8wwj7wxl2imdzqzbl")))) (build-system emacs-build-system) - (home-page - "https://github.com/tsdh/highlight-parentheses.el") + (home-page "https://github.com/tsdh/highlight-parentheses.el") (synopsis "Highlight surrounding parentheses") (description - "Enable the mode using M-x highlight-parentheses-mode or by adding it to + "Enable the mode using M-x highlight-parentheses-mode or by adding it to a hook.") (license license:gpl2))) @@ -195,22 +173,18 @@ a hook.") (package (name "emacs-quack") (version "20181106.1301") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/quack-" - version - ".el")) - (sha256 - (base32 - "0ph6zh91kasgbvi425a5m1hz94pxk6qa3srpy4khifsbn7cwiyga")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/quack-" version + ".el")) + (sha256 + (base32 + "0ph6zh91kasgbvi425a5m1hz94pxk6qa3srpy4khifsbn7cwiyga")))) (build-system emacs-build-system) (home-page "https://www.neilvandyke.org/quack/") - (synopsis - "Enhanced support for editing and running Scheme code") + (synopsis "Enhanced support for editing and running Scheme code") (description - "Quack enhances Emacs support for Scheme programming. The name + "Quack enhances Emacs support for Scheme programming. The name Quack was a play on DrScheme.") (license license:gpl2))) @@ -218,25 +192,20 @@ Quack was a play on DrScheme.") (package (name "emacs-hamlet-mode") (version "20131208.724") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/hamlet-mode-" - version - ".el")) - (sha256 - (base32 - "1r6nxi3d6bmnxrjjsam79vsprfwlnbhpag98vb1hj05yqp13l55v")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/hamlet-mode-" + version ".el")) + (sha256 + (base32 + "1r6nxi3d6bmnxrjjsam79vsprfwlnbhpag98vb1hj05yqp13l55v")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-s" ,emacs-s))) - (home-page - "https://github.com/lightquake/hamlet-mode") + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/lightquake/hamlet-mode") (synopsis "Hamlet editing mode") (description - "An Emacs major mode for editing files written in Hamlet, a + "An Emacs major mode for editing files written in Hamlet, a Haskell compile-time HTML templating engine. Currently it only provides syntax highlighting. @@ -249,35 +218,38 @@ go away at any time.") (package (name "emacs-mu4e-maildirs-extension") (version "20180606.812") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/mu4e-maildirs-extension-" - version - ".el")) - (sha256 - (base32 - "0rcn8mkabhn3w010hchr3xg72z7815j8fshfrcgxxcf9kygsg85b")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://melpa.org/packages/mu4e-maildirs-extension-" + version ".el")) + (sha256 + (base32 + "0rcn8mkabhn3w010hchr3xg72z7815j8fshfrcgxxcf9kygsg85b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "emacs" "-batch" - "--eval" "(provide 'mu4e)" - "--eval" "(defvar mu4e~main-buffer-name \"tests\")" - "--eval" "(defvar mu4e-mu-binary \"mu\")" - "--eval" "(require 'cl)" - "-l" "dash.el" - "-l" "mu4e-maildirs-extension.el" - "--eval" "(byte-compile-file \"mu4e-maildirs-extension.el\")")))))) - (home-page - "https://github.com/agpchil/mu4e-maildirs-extension") - (synopsis - "Show mu4e maildirs summary in mu4e-main-view") + '(#:phases (modify-phases %standard-phases + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (invoke "emacs" + "-batch" + "--eval" + "(provide 'mu4e)" + "--eval" + "(defvar mu4e~main-buffer-name \"tests\")" + "--eval" + "(defvar mu4e-mu-binary \"mu\")" + "--eval" + "(require 'cl)" + "-l" + "dash.el" + "-l" + "mu4e-maildirs-extension.el" + "--eval" + "(byte-compile-file \"mu4e-maildirs-extension.el\")")))))) + (home-page "https://github.com/agpchil/mu4e-maildirs-extension") + (synopsis "Show mu4e maildirs summary in mu4e-main-view") (description "Runs a mu command (async) in a shell process for each maildir to count unread and total mails.") (license license:gpl3))) @@ -286,45 +258,37 @@ maildir to count unread and total mails.") (package (name "emacs-helm-unicode") (version "20180608.1407") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/helm-unicode-" - version - ".el")) - (sha256 - (base32 - "0w0wvh9kwa4rj98ldi9ppsprw74926a1niih36dp7hbb61xmm7ny")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/helm-unicode-" + version ".el")) + (sha256 + (base32 + "0w0wvh9kwa4rj98ldi9ppsprw74926a1niih36dp7hbb61xmm7ny")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm))) (home-page "https://github.com/bomgar/helm-unicode") (synopsis "Helm command for unicode characters.") - (description - "A helm command for looking up unicode characters by name.") + (description "A helm command for looking up unicode characters by name.") (license #f))) (define-public emacs-vimish-fold (package (name "emacs-vimish-fold") (version "20200524.1729") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/vimish-fold-" - version - ".el")) - (sha256 - (base32 - "08p826zn4ris9b46r1d5z9v9jdj4lyr6kdmw4yhmnm9sk41z4bm4")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/vimish-fold-" + version ".el")) + (sha256 + (base32 + "08p826zn4ris9b46r1d5z9v9jdj4lyr6kdmw4yhmnm9sk41z4bm4")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-f" ,emacs-f))) - (home-page - "https://github.com/matsievskiysv/vimish-fold") + (home-page "https://github.com/matsievskiysv/vimish-fold") (synopsis "Fold text like in Vim") (description - "This is a package to perform text folding like in Vim. It has the + "This is a package to perform text folding like in Vim. It has the following features: * folding of active regions; @@ -347,23 +311,18 @@ following features: (package (name "emacs-grapnel") (version "20131001.1534") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/grapnel-" - version - ".el")) - (sha256 - (base32 - "1vnd025v7am19bamp0y50lq9abf2rzrbjslppvbk1ybb3lvw8n7q")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/grapnel-" + version ".el")) + (sha256 + (base32 + "1vnd025v7am19bamp0y50lq9abf2rzrbjslppvbk1ybb3lvw8n7q")))) (build-system emacs-build-system) - (home-page - "https://www.github.com/leathekd/grapnel") - (synopsis - "HTTP request lib with flexible callback dispatch") + (home-page "https://www.github.com/leathekd/grapnel") + (synopsis "HTTP request lib with flexible callback dispatch") (description - "Grapnel is an HTTP request library that uses a curl subprocess and + "Grapnel is an HTTP request library that uses a curl subprocess and offers flexible callback dispatch. Not only can you pass in an alist of request outcomes to callback functions (see below) but you can also override the dispatch function itself if the default one @@ -385,26 +344,20 @@ An example: (package (name "emacs-ix") (version "20131027.1629") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/ix-" - version - ".el")) - (sha256 - (base32 - "165nr8cz2y0mpcav0bkc8kak5zji4fayrs9v9wdzn0nksq6wdbls")))) + (source (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/ix-" version + ".el")) + (sha256 + (base32 + "165nr8cz2y0mpcav0bkc8kak5zji4fayrs9v9wdzn0nksq6wdbls")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-grapnel" ,emacs-grapnel) - ("curl" ,curl))) - (home-page - "https://www.github.com/theanalyst/ix.el") - (synopsis - "Emacs client for http://ix.io pastebin") + (propagated-inputs `(("emacs-grapnel" ,emacs-grapnel) + ("curl" ,curl))) + (home-page "https://www.github.com/theanalyst/ix.el") + (synopsis "Emacs client for http://ix.io pastebin") (description - "ix.el is a simple emacs client to http://ix.io cmdline pastebin. At + "ix.el is a simple emacs client to http://ix.io cmdline pastebin. At the moment using the code@{ix} command on a selection sends the selection to ix.io, entire buffer is sent if selection is inactive, on success the url is notified in the minibuffer as well as saved @@ -424,25 +377,21 @@ curl is used as the backend via grapnel http request library.") (package (name "emacs-persp-projectile") (version "20180616.1944") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/persp-projectile-" - version - ".el")) - (sha256 - (base32 - "1pc1v6rc44wl7sq0qchgc4lxiy8lr7zvp0hygcp95c1x0dkqs8jl")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://melpa.org/packages/persp-projectile-" version + ".el")) + (sha256 + (base32 + "1pc1v6rc44wl7sq0qchgc4lxiy8lr7zvp0hygcp95c1x0dkqs8jl")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-perspective" ,emacs-perspective) - ("emacs-projectile" ,emacs-projectile))) + (propagated-inputs `(("emacs-perspective" ,emacs-perspective) + ("emacs-projectile" ,emacs-projectile))) (home-page "https://github.com/bbatsov/persp-projectile") - (synopsis - "Perspective integration with Projectile") + (synopsis "Perspective integration with Projectile") (description - "This library bridges perspective mode to the awesome library + "This library bridges perspective mode to the awesome library Projectile. The idea is to create a separate perspective when switching project. A perspective is an independent workspace for Emacs, similar to multiple desktops in Gnome and MacOS. I often @@ -475,21 +424,16 @@ See perspective.el on github: https://github.com/nex3/perspective-el "0m4l894345n0zkbgl0ar4c93v8pyrhblk9zbrjrdr9cfz40bx2kd")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; TODO: Build is currently broken: - ;; https://github.com/cosmicexplorer/helm-rg/issues/20 - (delete 'build)))) - (native-inputs - `(("emacs" ,emacs-minimal))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-helm" ,emacs-helm))) - (home-page - "https://github.com/cosmicexplorer/helm-rg") + `(#:phases (modify-phases %standard-phases + ;; TODO: Build is currently broken: + ;; https://github.com/cosmicexplorer/helm-rg/issues/20 + (delete 'build)))) + (native-inputs `(("emacs" ,emacs-minimal))) + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-helm" ,emacs-helm))) + (home-page "https://github.com/cosmicexplorer/helm-rg") (synopsis "Helm interface to ripgrep") - (description - "Helm interface for ripgrep.") + (description "Helm interface for ripgrep.") (license license:gpl3+)))) (define-public emacs-ace-link-2021-01-1 @@ -499,16 +443,15 @@ See perspective.el on github: https://github.com/nex3/perspective-el (inherit emacs-ace-link) (name "emacs-ace-link-2021-01-1") (version (git-version "0.5.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/abo-abo/ace-link") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41"))))))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abo-abo/ace-link") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i243wfwrbxn00sh96248lpqfb7cvxqqwlc78nf8kim4ymylpp41"))))))) (define-public emacs-ace-mc (let ((commit "6877880efd99e177e4e9116a364576def3da391b") @@ -526,12 +469,10 @@ See perspective.el on github: https://github.com/nex3/perspective-el (base32 "180licc7w5b6f42ifwvllbnmf3aq8cbr8jhkbk37lzick4sv10d2")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-multiple-cursors" ,emacs-multiple-cursors) - ("emacs-ace-jump-mode" ,emacs-ace-jump-mode))) - (home-page - "https://github.com/mm--/ace-mc") + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-multiple-cursors" ,emacs-multiple-cursors) + ("emacs-ace-jump-mode" ,emacs-ace-jump-mode))) + (home-page "https://github.com/mm--/ace-mc") (synopsis "Easily add and remove multiple cursors using ace jump mode") (description "Easily add and remove multiple cursors using ace jump mode.") @@ -554,36 +495,36 @@ See perspective.el on github: https://github.com/nex3/perspective-el "0yic5rgp4f1rmi979if79kva7wn3rqnky423mqgf7sdw310h8akl")))) (build-system emacs-build-system) (inputs `(("emacs" ,emacs))) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-simple-httpd" ,emacs-simple-httpd) - ("emacs-f" ,emacs-f) - ("emacs-websocket" ,emacs-websocket) - ("emacs-org" ,emacs-org) - ("emacs-org-roam" ,emacs-org-roam))) + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-simple-httpd" ,emacs-simple-httpd) + ("emacs-f" ,emacs-f) + ("emacs-websocket" ,emacs-websocket) + ("emacs-org" ,emacs-org) + ("emacs-org-roam" ,emacs-org-roam))) (arguments `(#:include (cons "out/" %default-include) ;; TODO: this really should be done as part of either the emacs-org package, or as part of another separate package - #:phases - (modify-phases %standard-phases - (add-after 'build 'install-application - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (emacs (assoc-ref inputs "emacs")) - (xapplications (string-append out "/share/applications"))) - (mkdir-p xapplications) - (make-desktop-entry-file - (string-append xapplications "/org-protocol.desktop") - #:name "Org-Protocol" - #:exec (format #f "~a/bin/emacsclient %u" emacs) - #:icon "emacs-icon" - #:comment "Protocol which allows interaction between org-roam-server in emacs and a web browser" - #:categories '("Application") - #:mime-type "x-scheme-handler/org-protocol") - #t)))))) - (home-page - "https://github.com/org-roam/org-roam-ui") - (synopsis "A graphical frontend for exploring your org-roam Zettelkasten") + #:phases (modify-phases %standard-phases + (add-after 'build 'install-application + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (emacs (assoc-ref inputs "emacs")) + (xapplications (string-append out + "/share/applications"))) + (mkdir-p xapplications) + (make-desktop-entry-file (string-append + xapplications + "/org-protocol.desktop") + #:name "Org-Protocol" + #:exec (format #f "~a/bin/emacsclient %u" emacs) + #:icon "emacs-icon" + #:comment + "Protocol which allows interaction between org-roam-server in emacs and a web browser" + #:categories '("Application") + #:mime-type "x-scheme-handler/org-protocol") #t)))))) + (home-page "https://github.com/org-roam/org-roam-ui") + (synopsis + "A graphical frontend for exploring your org-roam Zettelkasten") (description "A graphical frontend for exploring your org-roam Zettelkasten.") (license license:gpl3+)))) @@ -604,10 +545,10 @@ See perspective.el on github: https://github.com/nex3/perspective-el (base32 "0fkbkdc269l4sbpvbnmqq02vl80dz80l3d2zq6ax6dwhlvxk2blp")))) (build-system emacs-build-system) - (propagated-inputs - `(("mu" ,mu))) + (propagated-inputs `(("mu" ,mu))) (home-page "https://github.com/rougier/mu4e-dashboard") - (synopsis "Provides mu4e org-mode link type for building org powered dashboards") + (synopsis + "Provides mu4e org-mode link type for building org powered dashboards") (description "Provides a new mu4e org link type that allows for mu4e queries from org-mode. These links can then be organized to form a org-mode powered mu4e @@ -616,26 +557,24 @@ dashboard!") (define-public emacs-org-timeline (package - (name "emacs-org-timeline") - (version "0.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Fuco1/org-timeline") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "106603835m3dy3bzjiasq2w574faxnn5kb72gr0y0mdkd0iwh8qa")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-org" ,emacs-org))) - (home-page "https://github.com/Fuco1/org-timeline") - (synopsis "Add graphical view of agenda to agenda buffer") - (description - "Add graphical view of agenda to agenda buffer.") - (license license:gpl3+))) + (name "emacs-org-timeline") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Fuco1/org-timeline") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "106603835m3dy3bzjiasq2w574faxnn5kb72gr0y0mdkd0iwh8qa")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-org" ,emacs-org))) + (home-page "https://github.com/Fuco1/org-timeline") + (synopsis "Add graphical view of agenda to agenda buffer") + (description "Add graphical view of agenda to agenda buffer.") + (license license:gpl3+))) (define-public emacs-org-html-themes (let ((commit "20f84182239a537f4c6b533eb65daa2d342428dd") @@ -654,32 +593,28 @@ dashboard!") "1jzkfsq4i4w2cgnlaw8cxa0b33rf8gy82bkbvl52hzlzhp68krgv")))) (build-system copy-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'hardcode-setup-file-paths - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (src (string-append out "/var/org-themes/org-html-themes/src/"))) - (for-each - (lambda (setup-file) - (substitute* setup-file - (("src=\"src/") - (string-append "src=\"" src)) - (("href=\"src/") - (string-append "href=\"" src)))) - (find-files out "\\.setup$")) - #t)))) + `(#:phases (modify-phases %standard-phases + (add-after 'install 'hardcode-setup-file-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src (string-append out + "/var/org-themes/org-html-themes/src/"))) + (for-each (lambda (setup-file) + (substitute* setup-file + (("src=\"src/") + (string-append "src=\"" src)) + (("href=\"src/") + (string-append "href=\"" src)))) + (find-files out "\\.setup$")) #t)))) #:install-plan ;; TODO: src contains a bunch of minified javascript, which blocks ;; this package from being merged upstream until resolved '(("src" "var/org-themes/org-html-themes/src") ("org/" "var/org-themes/org-html-themes" #:include-regexp ("-local\\.setup$"))))) - (home-page - "https://github.com/fniessen/org-html-themes") + (home-page "https://github.com/fniessen/org-html-themes") (synopsis "Set of org html export themes") - (description - "Export Org mode files into awesome HTML in 2 minutes.") + (description "Export Org mode files into awesome HTML in 2 minutes.") (license license:gpl3+)))) (define-public emacs-org-html-theme-darksun @@ -697,29 +632,27 @@ dashboard!") "0vncqab5ad6cbgqfq4qrf070q11858mvi0zhmji5ij2a233m3an6")))) (build-system copy-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'hardcode-setup-file-paths - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (src (string-append out "/var/org-themes/org-html-theme-darksun/export/"))) - (for-each - (lambda (setup-file) - (substitute* setup-file - (("src=\"export/") - (string-append "src=\"" src)) - (("href=\"export/") - (string-append "href=\"" src)))) - (find-files out "\\.setup$")) - #t)))) + `(#:phases (modify-phases %standard-phases + (add-after 'install 'hardcode-setup-file-paths + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src (string-append out + "/var/org-themes/org-html-theme-darksun/export/"))) + (for-each (lambda (setup-file) + (substitute* setup-file + (("src=\"export/") + (string-append "src=\"" src)) + (("href=\"export/") + (string-append "href=\"" src)))) + (find-files out "\\.setup$")) #t)))) #:install-plan ;; TODO: src contains a bunch of minified javascript, which blocks ;; this package from being merged upstream until resolved - '(("export/styles" "var/org-themes/org-html-theme-darksun/export/styles") + '(("export/styles" + "var/org-themes/org-html-theme-darksun/export/styles") ("export/setup/" "var/org-themes/org-html-theme-darksun" #:include-regexp ("-local\\.setup$"))))) - (home-page - "https://github.com/alphapapa/org-html-theme-darksun") + (home-page "https://github.com/alphapapa/org-html-theme-darksun") (synopsis "Solarized Dark version of the Bigblow Org HTML export theme") (description "Solarized Dark version of the Bigblow Org HTML export theme.") @@ -729,20 +662,21 @@ dashboard!") (package (name "emacs-matlab-mode") (version "20210726.858") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.code.sf.net/p/matlab-emacs/src") - (commit "c25894b91225ccdf0044f04020adf97cb41e73e4"))) - (sha256 - (base32 "0kns1f5kg4z5wqi26mql4ja2lm1rm8zji4sjiqqlbrnk800iic55")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/matlab-emacs/src") + (commit "c25894b91225ccdf0044f04020adf97cb41e73e4"))) + (sha256 + (base32 + "0kns1f5kg4z5wqi26mql4ja2lm1rm8zji4sjiqqlbrnk800iic55")))) (build-system emacs-build-system) - (arguments '(#:include '("^[^/]+.el$" "^[^/]+.m$") #:exclude '() - #:phases - (modify-phases %standard-phases - ;; Fails with error 'unable to locate "?$"' - (delete 'patch-el-files)))) + (arguments + '(#:include '("^[^/]+.el$" "^[^/]+.m$") + #:exclude '() + #:phases (modify-phases %standard-phases + ;; Fails with error 'unable to locate "?$"' + (delete 'patch-el-files)))) (home-page "http://matlab-emacs.sourceforge.net/") (synopsis "Major mode for MATLAB(R) dot-m files") (description "No description available.") @@ -753,38 +687,37 @@ dashboard!") (package (name "emacs-eval-in-repl") (version "20201121.1341") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kaz-yos/eval-in-repl") - (commit "2abb9ccf6f08ae3a5ab504f0b3fd81ce0345b766"))) - (sha256 - (base32 "1707c7v6n2w94nnlb6n08y2m11bh7abm6fks2zrf0i80srxb8mrk")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kaz-yos/eval-in-repl") + (commit "2abb9ccf6f08ae3a5ab504f0b3fd81ce0345b766"))) + (sha256 + (base32 + "1707c7v6n2w94nnlb6n08y2m11bh7abm6fks2zrf0i80srxb8mrk")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-dash" ,emacs-dash) - ("emacs-paredit" ,emacs-paredit) - ("emacs-ace-window" ,emacs-ace-window) - ("emacs-cider" ,emacs-cider) - ("emacs-elm-mode" ,emacs-elm-mode) - ("emacs-erlang" ,emacs-erlang) - ("emacs-geiser" ,emacs-geiser) - ("emacs-hy-mode" ,emacs-hy-mode) - ("emacs-elixir-mode" ,emacs-elixir-mode) - ("emacs-alchemist" ,emacs-alchemist) - ("emacs-js-comint" ,emacs-js-comint) - ("emacs-lua-mode" ,emacs-lua-mode) - ("emacs-tuareg" ,emacs-tuareg) - ("emacs-racket-mode" ,emacs-racket-mode) - ("emacs-inf-ruby" ,emacs-inf-ruby) - ("emacs-slime" ,emacs-slime) - ("emacs-sly" ,emacs-sly) - ("emacs-sml-mode" ,emacs-sml-mode))) + (propagated-inputs `(("emacs-dash" ,emacs-dash) + ("emacs-paredit" ,emacs-paredit) + ("emacs-ace-window" ,emacs-ace-window) + ("emacs-cider" ,emacs-cider) + ("emacs-elm-mode" ,emacs-elm-mode) + ("emacs-erlang" ,emacs-erlang) + ("emacs-geiser" ,emacs-geiser) + ("emacs-hy-mode" ,emacs-hy-mode) + ("emacs-elixir-mode" ,emacs-elixir-mode) + ("emacs-alchemist" ,emacs-alchemist) + ("emacs-js-comint" ,emacs-js-comint) + ("emacs-lua-mode" ,emacs-lua-mode) + ("emacs-tuareg" ,emacs-tuareg) + ("emacs-racket-mode" ,emacs-racket-mode) + ("emacs-inf-ruby" ,emacs-inf-ruby) + ("emacs-slime" ,emacs-slime) + ("emacs-sly" ,emacs-sly) + ("emacs-sml-mode" ,emacs-sml-mode))) (home-page "https://github.com/kaz-yos/eval-in-repl") (synopsis "Consistent ESS-like eval interface for various REPLs") (description - "Provides a consistent ESS-like eval interface for various REPLs + "Provides a consistent ESS-like eval interface for various REPLs This package does what ESS does for R for various REPLs, including ielm. @@ -802,23 +735,22 @@ work flow for various REPLs.") (package (name "emacs-org-babel-eval-in-repl") (version "20201206.1540") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/diadochos/org-babel-eval-in-repl") - (commit "3591f062873de2d64cc6f83b3555d030506e6ee7"))) - (sha256 - (base32 "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diadochos/org-babel-eval-in-repl") + (commit "3591f062873de2d64cc6f83b3555d030506e6ee7"))) + (sha256 + (base32 + "1fjifl69qja3ab0g72f1hkfns992qq0v9pw8p4hgvjycx7fpzk0a")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-eval-in-repl" ,emacs-eval-in-repl) - ("emacs-matlab-mode" ,emacs-matlab-mode) - ("emacs-ess" ,emacs-ess))) + (propagated-inputs `(("emacs-eval-in-repl" ,emacs-eval-in-repl) + ("emacs-matlab-mode" ,emacs-matlab-mode) + ("emacs-ess" ,emacs-ess))) (home-page "https://github.com/diadochos/org-babel-eval-in-repl") (synopsis "Eval org-mode babel code blocks in various REPLs.") (description - "Allows one to execute org-mode (babel) source code blocks with eval-in-repl. + "Allows one to execute org-mode (babel) source code blocks with eval-in-repl. @itemize @item Async execution (because it uses an external process!) @@ -833,45 +765,38 @@ For usage details, see @uref{https://github.com/diadochos/org-babel-eval-in-repl (package (name "emacs-alchemist") (version "20180312.1304") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tonini/alchemist.el") - (commit "6f99367511ae209f8fe2c990779764bbb4ccb6ed"))) - (sha256 - (base32 "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tonini/alchemist.el") + (commit "6f99367511ae209f8fe2c990779764bbb4ccb6ed"))) + (sha256 + (base32 + "12f95rwxs11sqf1w9pnf6cxc2lh2jz4nqkq33p8b5yamnl8cq9kg")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-elixir-mode" ,emacs-elixir-mode) - ("emacs-dash" ,emacs-dash) - ("emacs-company" ,emacs-company) - ("emacs-pkg-info" ,emacs-pkg-info) - ("emacs-s" ,emacs-s))) + (propagated-inputs `(("emacs-elixir-mode" ,emacs-elixir-mode) + ("emacs-dash" ,emacs-dash) + ("emacs-company" ,emacs-company) + ("emacs-pkg-info" ,emacs-pkg-info) + ("emacs-s" ,emacs-s))) (arguments - '(#:include - '("^[^/]+.el$" - "^[^/]+.el.in$" - "^dir$" - "^[^/]+.info$" - "^[^/]+.texi$" - "^[^/]+.texinfo$" - "^doc/dir$" - "^doc/[^/]+.info$" - "^doc/[^/]+.texi$" - "^doc/[^/]+.texinfo$" - "^[^/]+.exs$" - "^alchemist-server$") - #:exclude - '("^.dir-locals.el$" - "^test.el$" - "^tests.el$" - "^[^/]+-test.el$" - "^[^/]+-tests.el$"))) + '(#:include '("^[^/]+.el$" "^[^/]+.el.in$" + "^dir$" + "^[^/]+.info$" + "^[^/]+.texi$" + "^[^/]+.texinfo$" + "^doc/dir$" + "^doc/[^/]+.info$" + "^doc/[^/]+.texi$" + "^doc/[^/]+.texinfo$" + "^[^/]+.exs$" + "^alchemist-server$") + #:exclude '("^.dir-locals.el$" "^test.el$" "^tests.el$" + "^[^/]+-test.el$" "^[^/]+-tests.el$"))) (home-page "http://www.github.com/tonini/alchemist.el") (synopsis "Elixir tooling integration into Emacs") (description - "Alchemist brings you all the Elixir tooling and power inside your Emacs editor. + "Alchemist brings you all the Elixir tooling and power inside your Emacs editor. Alchemist comes with a bunch of features, which are: @@ -894,19 +819,19 @@ Alchemist comes with a bunch of features, which are: (package (name "emacs-js-comint") (version "20200117.615") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/redguardtoo/js-comint") - (commit "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6"))) - (sha256 - (base32 "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/redguardtoo/js-comint") + (commit "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6"))) + (sha256 + (base32 + "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka")))) (build-system emacs-build-system) (home-page "https://github.com/redguardtoo/js-comint") (synopsis "JavaScript interpreter in window.") (description - "Provides a comint mode for Emacs which allows you to run a + "Provides a comint mode for Emacs which allows you to run a compatible javascript repl like Node.js/Spidermonkey/Rhino inside Emacs. It also defines a few functions for sending javascript input to it quickly. @@ -921,14 +846,14 @@ For usage details, see @uref{https://github.com/redguardtoo/js-comint#usage}") (package (name "emacs-rcirc-notify") (version (git-version "20150219.2204" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nicferrier/rcirc-notify") - (commit commit))) - (sha256 - (base32 "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nicferrier/rcirc-notify") + (commit commit))) + (sha256 + (base32 + "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3")))) (build-system emacs-build-system) (home-page "https://github.com/nicferrier/rcirc-notify") (synopsis "Provide libnotify popup notifications for rcirc") @@ -944,20 +869,21 @@ the same functionality as it, but for rcirc.") (package (name "emacs-hledger-mode") (version (git-version "20210706.1225" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/narendraj9/hledger-mode") - (commit commit))) - (sha256 - (base32 "0x3dgws8nh7q8x7zzjwbm5k9n7gi7qqd3ww7y51fbx6p6ii3jpp4")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/narendraj9/hledger-mode") + (commit commit))) + (sha256 + (base32 + "0x3dgws8nh7q8x7zzjwbm5k9n7gi7qqd3ww7y51fbx6p6ii3jpp4")))) (build-system emacs-build-system) - (propagated-inputs - `(("emacs-popup" ,emacs-popup) - ("emacs-async" ,emacs-async) - ("emacs-htmlize" ,emacs-htmlize))) - (arguments '(#:include '("^[^/]+.el$") #:exclude '())) + (propagated-inputs `(("emacs-popup" ,emacs-popup) + ("emacs-async" ,emacs-async) + ("emacs-htmlize" ,emacs-htmlize))) + (arguments + '(#:include '("^[^/]+.el$") + #:exclude '())) (home-page "https://github.com/narendraj9/hledger-mode") (synopsis "Mode for writing journal entries for hledger") (description @@ -972,20 +898,20 @@ try @code{emacs-ledger-mode}.") (package (name "emacs-flycheck-hledger") (version "0.3.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DamienCassou/flycheck-hledger.git") - (commit (string-append "v" version)))) - (sha256 - (base32 "0q6b0vyd55x71kv4k7jp8xzgy5zf9md8mgy3y6pwmpga9dmv149j")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/DamienCassou/flycheck-hledger.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0q6b0vyd55x71kv4k7jp8xzgy5zf9md8mgy3y6pwmpga9dmv149j")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) (home-page "https://github.com/DamienCassou/flycheck-hledger/") (synopsis "Flycheck module to check hledger journals") - (description - "This package is a flycheck checker for hledger files.") + (description "This package is a flycheck checker for hledger files.") (license license:gpl3))) (define-public emacs-lsp-haskell diff --git a/rekahsoft-gnu/packages/golang.scm b/rekahsoft-gnu/packages/golang.scm index 5394eaa..b9fb746 100644 --- a/rekahsoft-gnu/packages/golang.scm +++ b/rekahsoft-gnu/packages/golang.scm @@ -17,7 +17,8 @@ ;;; . (define-module (rekahsoft-gnu packages golang) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) @@ -39,6 +40,7 @@ #:use-module (gnu packages password-utils) #:use-module (gnu packages lua) #:use-module (gnu packages mp3) + #:use-module (gnu packages tmux) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (ice-9 match) @@ -107,17 +109,42 @@ platforms. Gox will also build the cross-compilation toolchain for you.") (base32 "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) (build-system go-build-system) - (native-inputs - `(("go-github-com-jmespath-go-jmespath" ,go-github-com-jmespath-go-jmespath))) + (native-inputs `(("go-github-com-jmespath-go-jmespath" ,go-github-com-jmespath-go-jmespath))) (arguments '(#:import-path "github.com/aws/aws-sdk-go" #:phases %standard-phases)) - (synopsis "aws-sdk-go is the official AWS SDK for the Go programming language") + (synopsis + "aws-sdk-go is the official AWS SDK for the Go programming language") (description "aws-sdk-go is the official AWS SDK for the Go programming language.") (home-page "https://github.com/aws/aws-sdk-go") (license license:asl2.0))) +(define-public go-github-com-darthsim-overmind + (package + (name "go-github-com-darthsim-overmind") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DarthSim/overmind") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11ws9rsy8ladjp1y3b6vva9sjmw4s24xc1w18lyhfz63xc908nfw")))) + (build-system go-build-system) + (propagated-inputs (list tmux)) + (arguments + '(#:import-path "github.com/DarthSim/overmind")) + (home-page "https://github.com/DarthSim/overmind") + (synopsis "Overmind, a process manager for Procfile-based applications") + (description + "Overmind is a process manager for Procfile-based applications and +@url{https://tmux.github.io/,tmux}. With Overmind, you can easily run several +processes from your @code{Procfile} in a single terminal.") + (license license:expat))) + ;; TODO: this package is not yet complete, but was accidentally ;; committed. Commenting it out until it is completed. ;; diff --git a/rekahsoft-gnu/packages/haskell-apps.scm b/rekahsoft-gnu/packages/haskell-apps.scm index a22fb09..0fa8534 100644 --- a/rekahsoft-gnu/packages/haskell-apps.scm +++ b/rekahsoft-gnu/packages/haskell-apps.scm @@ -18,7 +18,8 @@ ;; Date: Dec 22, 2021 (define-module (rekahsoft-gnu packages haskell-apps) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -127,7 +128,7 @@ a drawing function and the library does the rest. To get started, see: (inputs (list ghc-ansi-terminal ghc-async ghc-breakpoint - ghc-brick ; note: fails to compile with brick@{1.5,1.6} + ghc-brick ;note: fails to compile with brick@{1.5,1.6} ghc-cmdargs ghc-data-default ghc-doclayout @@ -161,17 +162,17 @@ Plain Text Accounting. Read more at: ") (package (name "ghc-js-dgtable") (version "0.5.2") - (source - (origin - (method url-fetch) - (uri (hackage-uri "js-dgtable" version)) - (sha256 - (base32 "1b10kx703kbkb5q1ggdpqcrxqjb33kh24khk21rb30w0xrdxd3g2")))) + (source (origin + (method url-fetch) + (uri (hackage-uri "js-dgtable" version)) + (sha256 + (base32 + "1b10kx703kbkb5q1ggdpqcrxqjb33kh24khk21rb30w0xrdxd3g2")))) (build-system haskell-build-system) (home-page "https://github.com/ndmitchell/js-dgtable#readme") (synopsis "Obtain minified jquery.dgtable code") (description - "This package bundles the minified code into a Haskell package, so it can be depended upon by Cabal packages. The first three components of the version number match the upstream jquery.dgtable version. The package is designed to meet the redistribution @@ -182,17 +183,17 @@ requirements of downstream users (e.g. Debian).") (package (name "ghc-heaps") (version "0.4") - (source - (origin - (method url-fetch) - (uri (hackage-uri "heaps" version)) - (sha256 - (base32 "1zbw0qrlnhb42v04phzwmizbpwg21wnpl7p4fbr9xsasp7w9scl9")))) + (source (origin + (method url-fetch) + (uri (hackage-uri "heaps" version)) + (sha256 + (base32 + "1zbw0qrlnhb42v04phzwmizbpwg21wnpl7p4fbr9xsasp7w9scl9")))) (build-system haskell-build-system) (home-page "http://github.com/ekmett/heaps/") (synopsis "Asymptotically optimal Brodal/Okasaki heaps.") (description - "Asymptotically optimal Brodal\\/Okasaki bootstrapped skew-binomial heaps from the + "Asymptotically optimal Brodal\\/Okasaki bootstrapped skew-binomial heaps from the paper , extended with a 'Foldable' interface.") (license license:bsd-3))) @@ -202,26 +203,25 @@ Purely Functional Priority Queues\">, extended with a 'Foldable' interface.") (package (name "ghc-shake") (version "0.19.6") - (source - (origin - (method url-fetch) - (uri (hackage-uri "shake" version)) - (sha256 - (base32 "0hnm3h1ni4jq73a7b7yxhbg9wm8mrjda5kmkpnmclynnpwvvi7bx")))) + (source (origin + (method url-fetch) + (uri (hackage-uri "shake" version)) + (sha256 + (base32 + "0hnm3h1ni4jq73a7b7yxhbg9wm8mrjda5kmkpnmclynnpwvvi7bx")))) (build-system haskell-build-system) - (inputs - (list ghc-extra - ghc-filepattern - ghc-hashable - ghc-heaps - ghc-js-dgtable - ghc-js-flot - ghc-js-jquery - ghc-primitive - ghc-random - ghc-unordered-containers - ghc-utf8-string - ghc-semigroups)) + (inputs (list ghc-extra + ghc-filepattern + ghc-hashable + ghc-heaps + ghc-js-dgtable + ghc-js-flot + ghc-js-jquery + ghc-primitive + ghc-random + ghc-unordered-containers + ghc-utf8-string + ghc-semigroups)) (native-inputs (list ghc-quickcheck)) ;; fixme: tests currently fail. Current guess: /bin/sh is used to run ;; commands (in 'src/Development/Shake/Command.hs#L164') which is somehow @@ -230,9 +230,9 @@ Purely Functional Priority Queues\">, extended with a 'Foldable' interface.") `(#:tests? #f)) (home-page "https://shakebuild.com") (synopsis - "Build system library, like Make, but more accurate dependencies.") + "Build system library, like Make, but more accurate dependencies.") (description - "Shake is a Haskell library for writing build systems - designed as a replacement + "Shake is a Haskell library for writing build systems - designed as a replacement for @make@. See \"Development.Shake\" for an introduction, including an example. The homepage contains links to a user manual, an academic paper and further information: . To use Shake the user writes a Haskell diff --git a/rekahsoft-gnu/packages/haskell-web.scm b/rekahsoft-gnu/packages/haskell-web.scm index 1885c82..a50ef77 100644 --- a/rekahsoft-gnu/packages/haskell-web.scm +++ b/rekahsoft-gnu/packages/haskell-web.scm @@ -18,7 +18,8 @@ ;; Date: Nov 24, 2021 (define-module (rekahsoft-gnu packages haskell-web) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) @@ -35,99 +36,94 @@ (package (name "ghc-lrucache") (version "1.2.0.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/lrucache/lrucache-" - version - ".tar.gz")) - (sha256 - (base32 "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/lrucache/lrucache-" + version ".tar.gz")) + (sha256 + (base32 + "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw")))) (build-system haskell-build-system) (inputs `(("ghc-contravariant" ,ghc-contravariant))) (home-page "http://github.com/chowells79/lrucache") (synopsis "a simple, pure LRU cache") (description - "This package contains a simple, pure LRU cache, implemented in terms of \"Data.Map\". . It also contains a mutable IO wrapper providing atomic updates to an LRU cache.") + "This package contains a simple, pure LRU cache, implemented in terms of \"Data.Map\". . It also contains a mutable IO wrapper providing atomic updates to an LRU cache.") (license license:bsd-3))) (define-public ghc-hakyll (package (name "ghc-hakyll") (version "4.15.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/hakyll/hakyll-" - version - ".tar.gz")) - (sha256 - (base32 "18nhpnhi63xvmb14khw1ad8rwj2lxdyhpc58gnmr9vb5zz2db6bh")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/hakyll/hakyll-" + version ".tar.gz")) + (sha256 + (base32 + "18nhpnhi63xvmb14khw1ad8rwj2lxdyhpc58gnmr9vb5zz2db6bh")))) (build-system haskell-build-system) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-blaze-html" ,ghc-blaze-html) - ("ghc-blaze-markup" ,ghc-blaze-markup) - ("ghc-data-default" ,ghc-data-default) - ("ghc-file-embed" ,ghc-file-embed) - ("ghc-hashable" ,ghc-hashable) - ("ghc-lifted-async" ,ghc-lifted-async) - ("ghc-lrucache" ,ghc-lrucache) - ("ghc-network-uri" ,ghc-network-uri) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) - ("ghc-random" ,ghc-random) - ("ghc-regex-tdfa" ,ghc-regex-tdfa) - ("ghc-resourcet" ,ghc-resourcet) - ("ghc-scientific" ,ghc-scientific) - ("ghc-tagsoup" ,ghc-tagsoup) - ("ghc-time-locale-compat" ,ghc-time-locale-compat) - ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-vector" ,ghc-vector) - ("ghc-yaml" ,ghc-yaml) - ("ghc-wai" ,ghc-wai) - ("ghc-warp" ,ghc-warp) - ("ghc-wai-app-static" ,ghc-wai-app-static) - ("ghc-http-types" ,ghc-http-types) - ("ghc-fsnotify" ,ghc-fsnotify) - ("ghc-http-conduit" ,ghc-http-conduit) - ("ghc-pandoc" ,ghc-pandoc))) - (native-inputs - `(("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-tasty" ,ghc-tasty) - ("ghc-tasty-golden" ,ghc-tasty-golden) - ("ghc-tasty-hunit" ,ghc-tasty-hunit) - ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) - ;; "rev" program used during tests from util-linux - ("util-linux" ,util-linux))) + (inputs `(("ghc-aeson" ,ghc-aeson) + ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-blaze-markup" ,ghc-blaze-markup) + ("ghc-data-default" ,ghc-data-default) + ("ghc-file-embed" ,ghc-file-embed) + ("ghc-hashable" ,ghc-hashable) + ("ghc-lifted-async" ,ghc-lifted-async) + ("ghc-lrucache" ,ghc-lrucache) + ("ghc-network-uri" ,ghc-network-uri) + ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-random" ,ghc-random) + ("ghc-regex-tdfa" ,ghc-regex-tdfa) + ("ghc-resourcet" ,ghc-resourcet) + ("ghc-scientific" ,ghc-scientific) + ("ghc-tagsoup" ,ghc-tagsoup) + ("ghc-time-locale-compat" ,ghc-time-locale-compat) + ("ghc-unordered-containers" ,ghc-unordered-containers) + ("ghc-vector" ,ghc-vector) + ("ghc-yaml" ,ghc-yaml) + ("ghc-wai" ,ghc-wai) + ("ghc-warp" ,ghc-warp) + ("ghc-wai-app-static" ,ghc-wai-app-static) + ("ghc-http-types" ,ghc-http-types) + ("ghc-fsnotify" ,ghc-fsnotify) + ("ghc-http-conduit" ,ghc-http-conduit) + ("ghc-pandoc" ,ghc-pandoc))) + (native-inputs `(("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck) + ;; "rev" program used during tests from util-linux + ("util-linux" ,util-linux))) (arguments - `(#:cabal-revision - ("1" "1kxdvh7250nvfdz5wnchyqhghhp05i06sfnjg9ar17p0wyqzv46z"))) + `(#:cabal-revision ("1" + "1kxdvh7250nvfdz5wnchyqhghhp05i06sfnjg9ar17p0wyqzv46z"))) (home-page "http://jaspervdj.be/hakyll") (synopsis "A static website compiler library") (description - "Hakyll is a static website compiler library. It provides you with the tools to create a simple or advanced static website using a Haskell DSL and formats such as markdown or RST. You can find more information, including a tutorial, on the website: . * . If you seek assistance, there's: . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a channel on Freenode anymore) . Additionally, there's the Haddock documentation in the different modules, meant as a reference.") + "Hakyll is a static website compiler library. It provides you with the tools to create a simple or advanced static website using a Haskell DSL and formats such as markdown or RST. You can find more information, including a tutorial, on the website: . * . If you seek assistance, there's: . * A google group: . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a channel on Freenode anymore) . Additionally, there's the Haddock documentation in the different modules, meant as a reference.") (license license:bsd-3))) (define-public ghc-clay (package (name "ghc-clay") (version "0.13.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/clay/clay-" - version - ".tar.gz")) - (sha256 - (base32 "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx")))) + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/clay/clay-" version + ".tar.gz")) + (sha256 + (base32 + "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx")))) (build-system haskell-build-system) - (native-inputs - `(("ghc-hspec" ,ghc-hspec) ("ghc-hspec-discover" ,ghc-hspec-discover))) + (native-inputs `(("ghc-hspec" ,ghc-hspec) + ("ghc-hspec-discover" ,ghc-hspec-discover))) (home-page "http://fvisser.nl/clay") (synopsis "CSS preprocessor as embedded Haskell.") (description - "Clay is a CSS preprocessor like LESS and Sass, but implemented as an embedded domain specific language (EDSL) in Haskell. This means that all CSS selectors and style rules are first class Haskell functions, which makes reuse and composability easy. . The project is described on . . The API documentation can be found in the top level module \"Clay\".") + "Clay is a CSS preprocessor like LESS and Sass, but implemented as an embedded domain specific language (EDSL) in Haskell. This means that all CSS selectors and style rules are first class Haskell functions, which makes reuse and composability easy. . The project is described on . . The API documentation can be found in the top level module \"Clay\".") (license license:bsd-3))) diff --git a/rekahsoft-gnu/packages/perl.scm b/rekahsoft-gnu/packages/perl.scm index d3a0669..dd12823 100644 --- a/rekahsoft-gnu/packages/perl.scm +++ b/rekahsoft-gnu/packages/perl.scm @@ -19,7 +19,8 @@ (define-module (rekahsoft-gnu packages perl) #:use-module (srfi srfi-1) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -40,15 +41,14 @@ (package (name "perl-ntlm") (version "1.09") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-" - version - ".tar.gz")) - (sha256 - (base32 "118z2n9qhjalfj7l9hhpjppyxdg2c34h4hsqdriibg3nv86f68y8")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-" version + ".tar.gz")) + (sha256 + (base32 + "118z2n9qhjalfj7l9hhpjppyxdg2c34h4hsqdriibg3nv86f68y8")))) (build-system perl-build-system) (propagated-inputs `(("perl-digest-hmac" ,perl-digest-hmac))) (home-page "https://metacpan.org/release/NTLM") @@ -58,37 +58,35 @@ (define-public perl-encode-imaputf7 (package - (name "perl-encode-imaputf7") - (version "1.05") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-" - version - ".tar.gz")) - (sha256 - (base32 "1q9pgjckjxz0qfwaqmzm1dh1y09819vi6vf1sglcz0vlqgfha0s7")))) - (build-system perl-build-system) - (propagated-inputs `(("perl-test-nowarnings" ,perl-test-nowarnings))) - (home-page "https://metacpan.org/release/Encode-IMAPUTF7") - (synopsis "Modification of UTF-7 encoding for IMAP") - (description "Modification of UTF-7 encoding for IMAP") - (license #f))) + (name "perl-encode-imaputf7") + (version "1.05") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-" + version ".tar.gz")) + (sha256 + (base32 + "1q9pgjckjxz0qfwaqmzm1dh1y09819vi6vf1sglcz0vlqgfha0s7")))) + (build-system perl-build-system) + (propagated-inputs `(("perl-test-nowarnings" ,perl-test-nowarnings))) + (home-page "https://metacpan.org/release/Encode-IMAPUTF7") + (synopsis "Modification of UTF-7 encoding for IMAP") + (description "Modification of UTF-7 encoding for IMAP") + (license #f))) (define-public perl-file-tail (package (name "perl-file-tail") (version "1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-" - version - ".tar.gz")) - (sha256 - (base32 "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-" + version ".tar.gz")) + (sha256 + (base32 + "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/File-Tail") (synopsis "Perl extension for reading from continously updated files") @@ -99,20 +97,18 @@ (package (name "perl-io-socket-ssl") (version "2.073") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-" - version - ".tar.gz")) - (sha256 - (base32 "1j2prw40s3m3i41q3nnbdjw8kz8y992y5ki1ca0smcbwz56v7h5j")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-" + version ".tar.gz")) + (sha256 + (base32 + "1j2prw40s3m3i41q3nnbdjw8kz8y992y5ki1ca0smcbwz56v7h5j")))) (build-system perl-build-system) (native-inputs `(("perl-net-ssleay" ,perl-net-ssleay))) - (propagated-inputs - `(("perl-mozilla-ca" ,perl-mozilla-ca) - ("perl-net-ssleay" ,perl-net-ssleay))) + (propagated-inputs `(("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-net-ssleay" ,perl-net-ssleay))) (home-page "https://metacpan.org/release/IO-Socket-SSL") (synopsis "Nearly transparent SSL encapsulation for IO::Socket::INET.") (description "Nearly transparent SSL encapsulation for IO::Socket::INET.") @@ -122,15 +118,14 @@ (package (name "perl-io-tee") (version "0.66") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-" - version - ".tar.gz")) - (sha256 - (base32 "1q2jhp02rywrbyhvl2lv6qp70dcv5cfalrx3cc4c7y8nclhfg71d")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-" version + ".tar.gz")) + (sha256 + (base32 + "1q2jhp02rywrbyhvl2lv6qp70dcv5cfalrx3cc4c7y8nclhfg71d")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/IO-Tee") (synopsis "Multiplex output to multiple output handles") @@ -141,22 +136,20 @@ (package (name "perl-json-webtoken") (version "0.10") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-" - version - ".tar.gz")) - (sha256 - (base32 "12r40z7j8gs1p6wqn4k9f3k97p5lngaliidgh96p3w98hnlq5hbp")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-" + version ".tar.gz")) + (sha256 + (base32 + "12r40z7j8gs1p6wqn4k9f3k97p5lngaliidgh96p3w98hnlq5hbp")))) (build-system perl-build-system) - (native-inputs - `(("perl-module-build" ,perl-module-build) - ("perl-test-mock-guard" ,perl-test-mock-guard) - ("perl-test-requires" ,perl-test-requires))) - (propagated-inputs - `(("perl-json" ,perl-json) ("perl-module-runtime" ,perl-module-runtime))) + (native-inputs `(("perl-module-build" ,perl-module-build) + ("perl-test-mock-guard" ,perl-test-mock-guard) + ("perl-test-requires" ,perl-test-requires))) + (propagated-inputs `(("perl-json" ,perl-json) + ("perl-module-runtime" ,perl-module-runtime))) (home-page "https://metacpan.org/release/JSON-WebToken") (synopsis "JSON Web Token (JWT) implementation") (description "JSON Web Token (JWT) implementation") @@ -166,15 +159,14 @@ (package (name "perl-mail-imapclient") (version "3.43") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-" - version - ".tar.gz")) - (sha256 - (base32 "0vxl3xfr9fr844nhjx5br1yggavpycnyydi99pzahisvq7x9fg09")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-" + version ".tar.gz")) + (sha256 + (base32 + "0vxl3xfr9fr844nhjx5br1yggavpycnyydi99pzahisvq7x9fg09")))) (build-system perl-build-system) (propagated-inputs `(("perl-parse-recdescent" ,perl-parse-recdescent))) (home-page "https://metacpan.org/release/Mail-IMAPClient") @@ -186,35 +178,34 @@ (package (name "perl-getopt-argvfile") (version "1.11") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-" - version - ".tar.gz")) - (sha256 - (base32 "08jvhfqcjlsn013x96qa6paif0095x6y60jslp8p3zg67i8sl29p")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-" + version ".tar.gz")) + (sha256 + (base32 + "08jvhfqcjlsn013x96qa6paif0095x6y60jslp8p3zg67i8sl29p")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Getopt-ArgvFile") (synopsis "Interpolates script options from files into @ARGV or another array") - (description "Interpolates script options from files into @ARGV or another array.") + (description + "Interpolates script options from files into @ARGV or another array.") (license #f))) (define-public perl-module-signature (package (name "perl-module-signature") (version "0.88") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-" - version - ".tar.gz")) - (sha256 - (base32 "14i6yg7z4shsmzzdjzamcyjxpci8jxr0z336a3iy7n9plmss2z3p")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-" + version ".tar.gz")) + (sha256 + (base32 + "14i6yg7z4shsmzzdjzamcyjxpci8jxr0z336a3iy7n9plmss2z3p")))) (build-system perl-build-system) (native-inputs (list perl-ipc-run gnupg)) (home-page "https://metacpan.org/release/Module-Signature") @@ -226,18 +217,16 @@ (package (name "perl-par") (version "1.017") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-" - version - ".tar.gz")) - (sha256 - (base32 "0l4nfab7sh7452wgfnn0gdlh8pnrlnvim8njrfgkhk3miqjmnzf3")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-" + version ".tar.gz")) + (sha256 + (base32 + "0l4nfab7sh7452wgfnn0gdlh8pnrlnvim8njrfgkhk3miqjmnzf3")))) (build-system perl-build-system) - (propagated-inputs - `(("perl-archive-zip" ,perl-archive-zip) ("perl-par-dist" ,perl-par-dist))) + (propagated-inputs `(("perl-archive-zip" ,perl-archive-zip) + ("perl-par-dist" ,perl-par-dist))) (home-page "https://metacpan.org/release/PAR") (synopsis "Perl Archive Toolkit") (description "Perl Archive Toolkit.") @@ -247,18 +236,17 @@ (package (name "perl-tk-canvas-gradientcolor") (version "1.06") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/D/DJ/DJIBEL/Tk-Canvas-GradientColor-" - version - ".tar.gz")) - (sha256 - (base32 "07nw0xm30kb6mxjxgla2m28npnmrxz46xmvi9n2rhr5fv99jfymj")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DJ/DJIBEL/Tk-Canvas-GradientColor-" + version ".tar.gz")) + (sha256 + (base32 + "07nw0xm30kb6mxjxgla2m28npnmrxz46xmvi9n2rhr5fv99jfymj")))) (build-system perl-build-system) - (native-inputs - `(("perl-module-build" ,perl-module-build) ("perl-tk" ,perl-tk))) + (native-inputs `(("perl-module-build" ,perl-module-build) + ("perl-tk" ,perl-tk))) (home-page "https://metacpan.org/release/Tk-Canvas-GradientColor") (synopsis "To create a Canvas widget with background gradient color") (description "To create a Canvas widget with background gradient color.") @@ -268,20 +256,17 @@ (package (name "perl-tk-coloredbutton") (version "1.05") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/D/DJ/DJIBEL/Tk-ColoredButton-" - version - ".tar.gz")) - (sha256 - (base32 "0hngxviz5jbqchicjdqgby2ibwgr1glyimf88bfmbwk0i4x7h5zj")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DJ/DJIBEL/Tk-ColoredButton-" + version ".tar.gz")) + (sha256 + (base32 + "0hngxviz5jbqchicjdqgby2ibwgr1glyimf88bfmbwk0i4x7h5zj")))) (build-system perl-build-system) - (native-inputs - (list perl-module-build - perl-tk - perl-tk-canvas-gradientcolor)) + (native-inputs (list perl-module-build perl-tk + perl-tk-canvas-gradientcolor)) (home-page "https://metacpan.org/release/Tk-ColoredButton") (synopsis "Button widget with background gradient color") (description "Button widget with background gradient color.") @@ -291,37 +276,37 @@ (package (name "perl-tk-entrycheck") (version "0.04") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/S/ST/STRAT/Tk-EntryCheck-" - version - ".tar.gz")) - (sha256 - (base32 "0phx2ppgf8flcv7ap2zx705glz97mnc0cyp0pfibbwqlj3a4hcg8")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/ST/STRAT/Tk-EntryCheck-" + version ".tar.gz")) + (sha256 + (base32 + "0phx2ppgf8flcv7ap2zx705glz97mnc0cyp0pfibbwqlj3a4hcg8")))) (build-system perl-build-system) -; (native-inputs (list perl-tk)) ; TODO: needed for tests, but tests fail to open display :0 (depend on xorg) - (arguments `(#:tests? #f)) + ;; (native-inputs (list perl-tk)) ; TODO: needed for tests, but tests fail to open display :0 (depend on xorg) + (arguments + `(#:tests? #f)) (home-page "https://metacpan.org/release/Tk-EntryCheck") (synopsis "Interface to Tk::Entry for controlling its maximum length and content in an easy way") - (description "Interface to Tk::Entry for controlling its maximum length and content in an easy way.") + (description + "Interface to Tk::Entry for controlling its maximum length and content in an easy way.") (license license:perl-license))) (define-public perl-tk-fontdialog (package (name "perl-tk-fontdialog") (version "0.18") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/S/SR/SREZIC/Tk-FontDialog-" - version - ".tar.gz")) - (sha256 - (base32 "0ck3h2ssiisbk46l66shzpj7n06pjilx8h007appz2ry46vyh03w")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SR/SREZIC/Tk-FontDialog-" + version ".tar.gz")) + (sha256 + (base32 + "0ck3h2ssiisbk46l66shzpj7n06pjilx8h007appz2ry46vyh03w")))) (build-system perl-build-system) (propagated-inputs `(("perl-tk" ,perl-tk))) (home-page "https://metacpan.org/release/Tk-FontDialog") @@ -333,49 +318,47 @@ (package (name "perl-tk-getopt") (version "0.51") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/S/SR/SREZIC/Tk-Getopt-" - version - ".tar.gz")) - (sha256 - (base32 "0b7kln2614a9sycbbfjj23vpfn3r5rbshi0571wbcrmkjjpm90kg")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SR/SREZIC/Tk-Getopt-" version + ".tar.gz")) + (sha256 + (base32 + "0b7kln2614a9sycbbfjj23vpfn3r5rbshi0571wbcrmkjjpm90kg")))) (build-system perl-build-system) - (propagated-inputs - (list perl-tk perl-tk-fontdialog)) + (propagated-inputs (list perl-tk perl-tk-fontdialog)) (home-page "https://metacpan.org/release/Tk-Getopt") - (synopsis "User configuration window for Tk with interface to Getopt::Long") - (description "User configuration window for Tk with interface to Getopt::Long.") + (synopsis + "User configuration window for Tk with interface to Getopt::Long") + (description + "User configuration window for Tk with interface to Getopt::Long.") (license license:perl-license))) (define-public perl-par-packer (package (name "perl-par-packer") (version "1.052") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Packer-" - version - ".tar.gz")) - (sha256 - (base32 "16il9sgcnjg9w07grwrxagvk30bfn0hhrqa9f5z606k7yhvdbypz")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Packer-" + version ".tar.gz")) + (sha256 + (base32 + "16il9sgcnjg9w07grwrxagvk30bfn0hhrqa9f5z606k7yhvdbypz")))) (build-system perl-build-system) (native-inputs (list perl-ipc-run3)) - (propagated-inputs - (list perl-archive-zip - perl-getopt-argvfile - perl-module-scandeps - perl-module-signature - perl-par - perl-par-dist - perl-tk - perl-tk-coloredbutton - perl-tk-entrycheck - perl-tk-getopt)) + (propagated-inputs (list perl-archive-zip + perl-getopt-argvfile + perl-module-scandeps + perl-module-signature + perl-par + perl-par-dist + perl-tk + perl-tk-coloredbutton + perl-tk-entrycheck + perl-tk-getopt)) (home-page "https://metacpan.org/release/PAR-Packer") (synopsis "PAR Packager") (description "PAR Packager.") @@ -385,15 +368,14 @@ (package (name "perl-sys-meminfo") (version "0.99") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-" - version - ".tar.gz")) - (sha256 - (base32 "0fryrzj06wk2kxg4swsj9xqhn53yy55j8fbrf9fsx2rs7afk31h7")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-" + version ".tar.gz")) + (sha256 + (base32 + "0fryrzj06wk2kxg4swsj9xqhn53yy55j8fbrf9fsx2rs7afk31h7")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Sys-MemInfo") (synopsis "Query the total free and used physical memory") @@ -404,15 +386,14 @@ (package (name "perl-test-mock-guard") (version "0.10") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-" - version - ".tar.gz")) - (sha256 - (base32 "0gdx1nahk5sgg5ns1v1m50di4wshx09hl244lwmbkknnz1iql8kz")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-" + version ".tar.gz")) + (sha256 + (base32 + "0gdx1nahk5sgg5ns1v1m50di4wshx09hl244lwmbkknnz1iql8kz")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) (propagated-inputs `(("perl-class-load" ,perl-class-load))) @@ -425,15 +406,14 @@ (package (name "perl-unicode-string") (version "2.10") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-" - version - ".tar.gz")) - (sha256 - (base32 "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-" + version ".tar.gz")) + (sha256 + (base32 + "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Unicode-String") (synopsis "String of Unicode characters (UTF-16BE)") @@ -444,15 +424,14 @@ (package (name "perl-app-cpanminus") (version "1.7044") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-" - version - ".tar.gz")) - (sha256 - (base32 "1ww11x87b6z14yc3xk1sqajqjcx6c28g24rzkmxfylh7wizpcq4v")))) + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-" + version ".tar.gz")) + (sha256 + (base32 + "1ww11x87b6z14yc3xk1sqajqjcx6c28g24rzkmxfylh7wizpcq4v")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/App-cpanminus") (synopsis "Get, unpack, build and install modules from CPAN") @@ -475,61 +454,58 @@ (build-system gnu-build-system) (native-inputs (list inetutils perl)) ;; TODO: these should be normal inputs, but currently the executable produced is not wrapped, so it fails to load the required libs - (propagated-inputs - (list perl-cgi - perl-app-cpanminus - perl-crypt-openssl-rsa - perl-data-uniqid - perl-digest-hmac - perl-dist-checkconflicts - perl-encode - perl-encode-imaputf7 - perl-file-copy-recursive - perl-file-tail - perl-io-socket-inet6 - perl-io-socket-ssl - perl-io-tee - perl-json - perl-json-webtoken - perl-libwww - perl-mail-imapclient - perl-module-implementation - perl-module-scandeps - perl-net-ssleay - perl-ntlm - perl-package-stash - perl-par-packer - perl-parse-recdescent - perl-readonly - perl-regexp-common - perl-sys-meminfo - perl-term-readkey - perl-test-deep - perl-test-fatal - perl-test-mock-guard - perl-test-mockobject - perl-test-pod - perl-test-requires - perl-unicode-string - perl-uri - perl-try-tiny)) + (propagated-inputs (list perl-cgi + perl-app-cpanminus + perl-crypt-openssl-rsa + perl-data-uniqid + perl-digest-hmac + perl-dist-checkconflicts + perl-encode + perl-encode-imaputf7 + perl-file-copy-recursive + perl-file-tail + perl-io-socket-inet6 + perl-io-socket-ssl + perl-io-tee + perl-json + perl-json-webtoken + perl-libwww + perl-mail-imapclient + perl-module-implementation + perl-module-scandeps + perl-net-ssleay + perl-ntlm + perl-package-stash + perl-par-packer + perl-parse-recdescent + perl-readonly + perl-regexp-common + perl-sys-meminfo + perl-term-readkey + perl-test-deep + perl-test-fatal + perl-test-mock-guard + perl-test-mockobject + perl-test-pod + perl-test-requires + perl-unicode-string + perl-uri + perl-try-tiny)) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (invoke "make") - #t))) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (mkdir-p "./W") ;; make install fails unless a W directory exists - (invoke "make" "install" "PREFIX=/" (string-append "DESTDIR=" out)) - #t)))))) + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (invoke "make") #t))) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p "./W") ;make install fails unless a W directory exists + (invoke "make" "install" "PREFIX=/" + (string-append "DESTDIR=" out)) #t)))))) (synopsis "Imapsync is an IMAP transfers tool") (description "Imapsync is an IMAP transfers tool. The purpose of imapsync is to diff --git a/rekahsoft-gnu/packages/python-xyz.scm b/rekahsoft-gnu/packages/python-xyz.scm index d08b994..995773c 100644 --- a/rekahsoft-gnu/packages/python-xyz.scm +++ b/rekahsoft-gnu/packages/python-xyz.scm @@ -17,7 +17,8 @@ ;;; . (define-module (rekahsoft-gnu packages python-xyz) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages cmake) @@ -42,23 +43,21 @@ (package (name "python-virtualenv-clone") (version "0.5.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "virtualenv-clone" version)) - (sha256 - (base32 - "06jhhf8hndcgyk9k3bjbk3vz1xpajfxj9667agqzhlk1qcsyk3j1")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "virtualenv-clone" version)) + (sha256 + (base32 + "06jhhf8hndcgyk9k3bjbk3vz1xpajfxj9667agqzhlk1qcsyk3j1")))) (build-system python-build-system) ;; (native-inputs - ;; `(("python-pytest" ,python-pytest) - ;; ("python-tox" ,python-tox) - ;; ("python-virtualenv" ,python-virtualenv))) + ;; `(("python-pytest" ,python-pytest) + ;; ("python-tox" ,python-tox) + ;; ("python-virtualenv" ,python-virtualenv))) (arguments ;; FIXME: Tests currently fail `(#:tests? #f)) - (home-page - "https://github.com/edwardgeorge/virtualenv-clone") + (home-page "https://github.com/edwardgeorge/virtualenv-clone") (synopsis "Script to clone virtualenvs.") (description "Script to clone virtualenvs.") (license license:expat))) @@ -68,22 +67,19 @@ (package (name "python-arpeggio") (version "1.9.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Arpeggio" version)) - (sha256 - (base32 - "0aq2pmhfyq7vhbhyq8jgxiphncy1s79rmrsggz4p52m4cdhy134l")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "Arpeggio" version)) + (sha256 + (base32 + "0aq2pmhfyq7vhbhyq8jgxiphncy1s79rmrsggz4p52m4cdhy134l")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner))) + (native-inputs `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) (arguments ;; FIXME: Tests currently fail `(#:tests? #f)) - (home-page - "https://github.com/textX/Arpeggio") + (home-page "https://github.com/textX/Arpeggio") (synopsis "Packrat parser interpreter") (description "Packrat parser interpreter") (license license:expat))) @@ -93,38 +89,34 @@ (package (name "python-parver") (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "parver" version)) - (sha256 - (base32 - "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "parver" version)) + (sha256 + (base32 + "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm")))) (build-system python-build-system) - (native-inputs - `(("python-six" ,python-six) - ("python-attrs" ,python-attrs) - ("python-arpeggio" ,python-arpeggio) - ("python-pytest" ,python-pytest) - ("python-hypothesis" ,python-hypothesis) - ("python-pretend" ,python-pretend))) + (native-inputs `(("python-six" ,python-six) + ("python-attrs" ,python-attrs) + ("python-arpeggio" ,python-arpeggio) + ("python-pytest" ,python-pytest) + ("python-hypothesis" ,python-hypothesis) + ("python-pretend" ,python-pretend))) (home-page "https://github.com/RazerM/parver") - (synopsis - "Parse and manipulate version numbers") - (description - "Parse and manipulate version numbers.") + (synopsis "Parse and manipulate version numbers") + (description "Parse and manipulate version numbers.") (license license:expat))) (define-public python-bs4 (package (name "python-bs4") (version "0.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "bs4" version)) - (sha256 - (base32 "0fnxhql23ql6q5n64xjknx3sc3fm4vgpbw0z99p0qp6cswgymv1n")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "bs4" version)) + (sha256 + (base32 + "0fnxhql23ql6q5n64xjknx3sc3fm4vgpbw0z99p0qp6cswgymv1n")))) (build-system python-build-system) (propagated-inputs (list python-beautifulsoup4)) (home-page "https://pypi.python.org/pypi/beautifulsoup4") @@ -136,19 +128,15 @@ (package (name "python-towncrier") (version "21.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "towncrier" version)) - (sha256 - (base32 "1znxavwsiy6czirjn0qi1p5yarnm7gg692nb0309hb6p4k4hpvbf")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "towncrier" version)) + (sha256 + (base32 + "1znxavwsiy6czirjn0qi1p5yarnm7gg692nb0309hb6p4k4hpvbf")))) (build-system python-build-system) - (propagated-inputs - (list python-click - python-click-default-group - python-incremental - python-jinja2 - python-toml)) + (propagated-inputs (list python-click python-click-default-group + python-incremental python-jinja2 python-toml)) (native-inputs (list python-packaging)) (home-page "https://github.com/hawkowl/towncrier") (synopsis "Building newsfiles for your project.") @@ -160,33 +148,28 @@ (package (name "python-pipenv") (version "2022.1.8") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pipenv" version)) - (sha256 - (base32 "1l4zabd1q5aggjhp4v906l8z8g6q37bcgyxqq8man8lv4ccp2kgq")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "pipenv" version)) + (sha256 + (base32 + "1l4zabd1q5aggjhp4v906l8z8g6q37bcgyxqq8man8lv4ccp2kgq")))) (build-system python-build-system) - (propagated-inputs - (list python-certifi - python-pip - python-setuptools - python-virtualenv - python-virtualenv-clone)) - (native-inputs - (list python-black - python-bs4 - python-flake8 - python-flaky - python-invoke - python-mock - python-parver - python-pytest - python-pytest-timeout - python-pytest-xdist - python-sphinx - python-towncrier - python-twine)) + (propagated-inputs (list python-certifi python-pip python-setuptools + python-virtualenv python-virtualenv-clone)) + (native-inputs (list python-black + python-bs4 + python-flake8 + python-flaky + python-invoke + python-mock + python-parver + python-pytest + python-pytest-timeout + python-pytest-xdist + python-sphinx + python-towncrier + python-twine)) (arguments ;; FIXME: Tests fail with: "TypeError: don't know how to make test from: 2022.1.8" '(#:tests? #f)) @@ -200,39 +183,38 @@ (package (name "python-ujson") (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ujson" version)) - (sha256 - (base32 - "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "deps") #t)))) + (source (origin + (method url-fetch) + (uri (pypi-uri "ujson" version)) + (sha256 + (base32 + "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "deps") #t)))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'link-to-system-double-conversion - (lambda* (#:key inputs #:allow-other-keys) - (let ((d-c (assoc-ref inputs "double-conversion"))) - (substitute* "setup.py" - (("./deps/double-conversion/double-conversion\"") - (string-append d-c "/include/double-conversion\"")) - (("-lstdc++" stdc) - (string-append "-L" d-c "/lib\"," - " \"-ldouble-conversion\"," - " \"" stdc))) - #t))) - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest")))))) - (native-inputs - `(("double-conversion" ,double-conversion) - ("python-setuptools-scm" ,python-setuptools-scm) - ("python-pytest" ,python-pytest))) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'link-to-system-double-conversion + (lambda* (#:key inputs #:allow-other-keys) + (let ((d-c (assoc-ref inputs "double-conversion"))) + (substitute* "setup.py" + (("./deps/double-conversion/double-conversion\"") + (string-append d-c "/include/double-conversion\"")) + (("-lstdc++" stdc) + (string-append "-L" + d-c + "/lib\"," + " \"-ldouble-conversion\"," + " \"" + stdc))) #t))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest")))))) + (native-inputs `(("double-conversion" ,double-conversion) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-pytest" ,python-pytest))) (home-page "https://github.com/ultrajson/ultrajson") (synopsis "Ultra fast JSON encoder and decoder for Python") (description @@ -245,93 +227,95 @@ bindings for Python 3.") ;; awscliv2 depends on 'prompt-toolkit<3.0.29,>=3.0.24', however upstream 3.0.29 is packaged (define-public python-prompt-toolkit-3.0.28 (package/inherit python-prompt-toolkit - (name "python-prompt-toolkit") - (version "3.0.28") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version)) - (sha256 - (base32 - "0l0nnm9fvs8lklk2qq8mylb9jrlxvlqzpmqr4n7rdhl63rmx274z")))))) + (name "python-prompt-toolkit") + (version "3.0.28") + (source (origin + (method url-fetch) + (uri (pypi-uri "prompt_toolkit" version)) + (sha256 (base32 + "0l0nnm9fvs8lklk2qq8mylb9jrlxvlqzpmqr4n7rdhl63rmx274z")))))) (define-public awscliv2 (package (inherit awscli) (name "awscliv2") (version "2.7.18") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/aws-cli") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "10p6433spz3lw5jwnw0kflp3fh629chiscp868slld6x2kp80gi4")))) - (native-inputs - `(("python-distro" ,python-distro-1.5) - ("python-docutils" ,python-docutils-0.15) - ("python-s3transfer" ,python-s3transfer) - ("python-awscrt" ,python-awscrt) - ("python-prompt-toolkit" ,python-prompt-toolkit-3.0.28) - ("python-ruamel.yaml" ,python-ruamel.yaml-0.15) - ("python-cryptography" ,python-cryptography-3.3.2) - ("python-botocore" ,python-botocore-2.0.0dev155))) - (propagated-inputs - `(,@(fold alist-delete - (package-propagated-inputs awscli) - '("python-botocore")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/aws-cli") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10p6433spz3lw5jwnw0kflp3fh629chiscp868slld6x2kp80gi4")))) + (native-inputs `(("python-distro" ,python-distro-1.5) + ("python-docutils" ,python-docutils-0.15) + ("python-s3transfer" ,python-s3transfer) + ("python-awscrt" ,python-awscrt) + ("python-prompt-toolkit" ,python-prompt-toolkit-3.0.28) + ("python-ruamel.yaml" ,python-ruamel.yaml-0.15) + ("python-cryptography" ,python-cryptography-3.3.2) + ("python-botocore" ,python-botocore-2.0.0dev155))) + (propagated-inputs `(,@(fold alist-delete + (package-propagated-inputs awscli) + '("python-botocore")))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'removed-vendored - (lambda* _ - (for-each delete-file-recursively - '("awscli/botocore" "awscli/s3transfer")) - (symlink (string-append - (assoc-ref %build-inputs "python-botocore") - "/lib/python" - (python-version (assoc-ref %build-inputs "python")) - "/site-packages/botocore") - "awscli/botocore") - (symlink (string-append - (assoc-ref %build-inputs "python-s3transfer") - "/lib/python" - (python-version (assoc-ref %build-inputs "python")) - "/site-packages/s3transfer") - "awscli/s3transfer") - #t)) - (add-after 'install 'generate-completions - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (python-version (python-version (assoc-ref inputs "python"))) - (data (string-append out "/lib/python" python-version - "/site-packages/awscli/data")) - (bash-completion - (string-append out "/share/bash-completion/completions")) - (zsh-site-functions - (string-append out "/share/zsh/site-functions"))) - (mkdir-p data) - (add-installed-pythonpath inputs outputs) + `(#:phases (modify-phases %standard-phases + (add-before 'build 'removed-vendored + (lambda* _ + (for-each delete-file-recursively + '("awscli/botocore" "awscli/s3transfer")) + (symlink (string-append (assoc-ref %build-inputs + "python-botocore") + "/lib/python" + (python-version (assoc-ref + %build-inputs + "python")) + "/site-packages/botocore") + "awscli/botocore") + (symlink (string-append (assoc-ref %build-inputs + "python-s3transfer") + "/lib/python" + (python-version (assoc-ref + %build-inputs + "python")) + "/site-packages/s3transfer") + "awscli/s3transfer") #t)) + (add-after 'install 'generate-completions + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python-version (python-version (assoc-ref inputs + "python"))) + (data (string-append out "/lib/python" + python-version + "/site-packages/awscli/data")) + (bash-completion (string-append out + "/share/bash-completion/completions")) + (zsh-site-functions (string-append out + "/share/zsh/site-functions"))) + (mkdir-p data) + (add-installed-pythonpath inputs outputs) - (invoke "python" "scripts/gen-ac-index" - "--index-location" (string-append data "/ac.index")) + (invoke "python" "scripts/gen-ac-index" + "--index-location" + (string-append data "/ac.index")) - (mkdir-p bash-completion) - (call-with-output-file - (string-append bash-completion "/aws") - (lambda (port) - (format - port - (string-join - (list - "complete" "-C" (string-append out "/bin/aws_completer") "aws"))))) + (mkdir-p bash-completion) + (call-with-output-file (string-append bash-completion + "/aws") + (lambda (port) + (format port + (string-join (list "complete" "-C" + (string-append out + "/bin/aws_completer") + "aws"))))) - (mkdir-p zsh-site-functions) - (rename-file (string-append out "/bin/aws_zsh_completer.sh") - (string-append zsh-site-functions "/_aws")) - #t)))) + (mkdir-p zsh-site-functions) + (rename-file (string-append out + "/bin/aws_zsh_completer.sh") + (string-append zsh-site-functions "/_aws")) + #t)))) ;; FIXME: Tests currently fail #:tests? #f)) (synopsis "Command line client for AWS v2") @@ -340,76 +324,66 @@ Amazon Web Services (AWS) API."))) (define-public python-jmespath-0.10 (package - (inherit python-jmespath) - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "jmespath" version)) - (sha256 - (base32 - "1yflbqggg1z9ndw9ps771hy36d07j9l2wwbj66lljqb6p1khapdq")))))) + (inherit python-jmespath) + (version "0.10.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "jmespath" version)) + (sha256 + (base32 + "1yflbqggg1z9ndw9ps771hy36d07j9l2wwbj66lljqb6p1khapdq")))))) (define-public python-distro-1.5 (package (inherit python-distro) (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "distro" version)) - (sha256 - (base32 - "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f")))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "distro" version)) + (sha256 + (base32 + "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f")))))) (define-public python-ruamel.yaml-0.15 (package (inherit python-ruamel.yaml) (name "python-ruamel.yaml") (version "0.15.100") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ruamel.yaml" version)) - (sha256 - (base32 - "1r5j9n2jdq48z0k4bdia1f7krn8f2x3y49i9ba9iks2rg83g6hlf")))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "ruamel.yaml" version)) + (sha256 + (base32 + "1r5j9n2jdq48z0k4bdia1f7krn8f2x3y49i9ba9iks2rg83g6hlf")))))) (define-public python-cryptography-3.3.2 (package (inherit python-cryptography) (name "python-cryptography") (version "3.3.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cryptography" version)) - (sha256 - (base32 - "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s")))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "cryptography" version)) + (sha256 + (base32 + "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s")))))) (define-public python-awscrt (package (name "python-awscrt") (version "0.12.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "awscrt" version)) - (sha256 - (base32 - "1cmfkcv2zzirxsb989vx1hvna9nv24pghcvypl0zaxsjphv97mka")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "awscrt" version)) + (sha256 + (base32 + "1cmfkcv2zzirxsb989vx1hvna9nv24pghcvypl0zaxsjphv97mka")))) (build-system python-build-system) - (native-inputs - `(("cmake" ,cmake))) - (propagated-inputs - `(("python-boto3" ,python-boto3))) - (home-page - "https://github.com/awslabs/aws-crt-python") - (synopsis - "Common runtime for AWS Python projects") - (description - "Common runtime for AWS Python projects") + (native-inputs `(("cmake" ,cmake))) + (propagated-inputs `(("python-boto3" ,python-boto3))) + (home-page "https://github.com/awslabs/aws-crt-python") + (synopsis "Common runtime for AWS Python projects") + (description "Common runtime for AWS Python projects") (license license:asl2.0))) (define-public python-botocore-2.0.0dev155 @@ -419,56 +393,53 @@ Amazon Web Services (AWS) API."))) (inherit python-botocore) (name "python-botocore") (version "2.0.0dev155") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/boto/botocore") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lr98h80fgs6kplv52y92pcf1ba4041zq26wdfsfjkg84py9q83a")))) - (propagated-inputs - `(("python-awscrt" ,python-awscrt) - ("python-jmespath" ,python-jmespath-0.10) - ,@(package-propagated-inputs python-awscrt)))))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/boto/botocore") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lr98h80fgs6kplv52y92pcf1ba4041zq26wdfsfjkg84py9q83a")))) + (propagated-inputs `(("python-awscrt" ,python-awscrt) + ("python-jmespath" ,python-jmespath-0.10) + ,@(package-propagated-inputs python-awscrt)))))) (define-public python-htmlark (package - (name "python-htmlark") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "HTMLArk" version)) - (sha256 - (base32 "0qg2vwnlqhdhxxkji3l6ls4ycsrjmhvjizsa7hw08373f69mj68v")))) - (build-system python-build-system) - (propagated-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) - ("python-lxml" ,python-lxml) - ("python-html5lib" ,python-html5lib) - ("python-requests" ,python-requests))) - (home-page "https://github.com/BitLooter/htmlark") - (synopsis "Pack a webpage including support files into a single HTML file") - (description - "Pack a webpage including support files into a single HTML file.") - (license license:expat))) + (name "python-htmlark") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "HTMLArk" version)) + (sha256 + (base32 + "0qg2vwnlqhdhxxkji3l6ls4ycsrjmhvjizsa7hw08373f69mj68v")))) + (build-system python-build-system) + (propagated-inputs `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-lxml" ,python-lxml) + ("python-html5lib" ,python-html5lib) + ("python-requests" ,python-requests))) + (home-page "https://github.com/BitLooter/htmlark") + (synopsis "Pack a webpage including support files into a single HTML file") + (description + "Pack a webpage including support files into a single HTML file.") + (license license:expat))) (define-public python-ofxhome (package (name "python-ofxhome") (version "0.3.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ofxhome" version)) - (sha256 - (base32 "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "ofxhome" version)) + (sha256 + (base32 + "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445")))) (build-system python-build-system) (arguments - `(;; TODO: tests currently fail due to missing test file: + `( ;TODO: tests currently fail due to missing test file: ;; FileNotFoundError: [Errno 2] No such file or directory: '/tmp/guix-build-python-ofxhome-0.3.3.drv-0/ofxhome-0.3.3/ofxhome/tests/testfiles/jpmorgan.xml' #:tests? #f)) (home-page "https://github.com/captin411/ofxhome") @@ -482,12 +453,12 @@ Amazon Web Services (AWS) API."))) (package (name "python-argparse") (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "argparse" version)) - (sha256 - (base32 "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "argparse" version)) + (sha256 + (base32 + "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32")))) (build-system python-build-system) (home-page "https://github.com/ThomasWaldmann/argparse/") (synopsis "Python command-line parsing library") @@ -499,20 +470,19 @@ Amazon Web Services (AWS) API."))) (package (name "python-ofxclient") (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ofxclient" version)) - (sha256 - (base32 "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "ofxclient" version)) + (sha256 + (base32 + "0jdhqsbl34yn3n0x6mwsnl58c25v5lp6vr910c2hk7l74l5y7538")))) (build-system python-build-system) - (propagated-inputs - `(("python-beautifulsoup4" ,python-beautifulsoup4) - ("python-keyring" ,python-keyring) - ("python-lxml" ,python-lxml) - ("python-ofxhome" ,python-ofxhome) - ("python-ofxparse" ,python-ofxparse) - ("python-argparse" ,python-argparse))) + (propagated-inputs `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-keyring" ,python-keyring) + ("python-lxml" ,python-lxml) + ("python-ofxhome" ,python-ofxhome) + ("python-ofxparse" ,python-ofxparse) + ("python-argparse" ,python-argparse))) (home-page "https://github.com/captin411/ofxclient") (synopsis "OFX client for dowloading transactions from banks") (description "OFX client for dowloading transactions from banks") @@ -523,16 +493,14 @@ Amazon Web Services (AWS) API."))) (package (name "ledger-autosync") (version "1.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ledger-autosync" version)) - (sha256 - (base32 "0i4942qbsphq72zx7kd3rgw25rpq4fg4vl43akkl189wzcrgwv6j")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "ledger-autosync" version)) + (sha256 + (base32 + "0i4942qbsphq72zx7kd3rgw25rpq4fg4vl43akkl189wzcrgwv6j")))) (build-system python-build-system) - (inputs - (list python-ofxclient - python-ofxparse)) + (inputs (list python-ofxclient python-ofxparse)) (home-page "https://gitlab.com/egh/ledger-autosync") (synopsis "Automatically sync your bank's data with ledger") (description "Automatically sync your bank's data with ledger") @@ -542,11 +510,10 @@ Amazon Web Services (AWS) API."))) (package (inherit python-pyyaml) (version "5.4.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyYAML" version)) - (sha256 - (base32 - "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) diff --git a/rekahsoft-gnu/packages/shellutils.scm b/rekahsoft-gnu/packages/shellutils.scm index 04f0b50..edfcd8c 100644 --- a/rekahsoft-gnu/packages/shellutils.scm +++ b/rekahsoft-gnu/packages/shellutils.scm @@ -17,7 +17,8 @@ ;;; . (define-module (rekahsoft-gnu packages shellutils) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) @@ -54,41 +55,43 @@ (base32 "0hyxydrk057pcaqqfbbi0a4zrfxgx7688rm466a7ambl3vsrdscv")))) (build-system go-build-system) - (native-inputs - `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) - ("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth) - ("github.com/mattn/go-shellwords" ,go-github-com-mattn-go-shellwords) - ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) - ("go-golang-org-x-sys" ,go-golang-org-x-sys) - ("go-github-com-saracen-walker" ,go-github-com-saracen-walker) - ("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup) - ("go-github-com-rivo-uniseg" ,go-github-com-rivo-uniseg) - ("go-golang-org-x-term" ,go-golang-org-x-term))) - (propagated-inputs - `(("tmux" ,tmux) - ("perl" ,perl))) + (native-inputs `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) + ("github.com/mattn/go-runewidth" ,go-github.com-mattn-go-runewidth) + ("github.com/mattn/go-shellwords" ,go-github-com-mattn-go-shellwords) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) + ("go-golang-org-x-sys" ,go-golang-org-x-sys) + ("go-github-com-saracen-walker" ,go-github-com-saracen-walker) + ("go-golang.org-x-sync-errgroup" ,go-golang.org-x-sync-errgroup) + ("go-github-com-rivo-uniseg" ,go-github-com-rivo-uniseg) + ("go-golang-org-x-term" ,go-golang-org-x-term))) + (propagated-inputs `(("tmux" ,tmux) + ("perl" ,perl))) (arguments `(#:import-path "github.com/junegunn/fzf" #:install-source? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'setup-env - (lambda _ - (setenv "FZF_VERSION" ,version) - (setenv "FZF_REVISION" ,version))) - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/junegunn/fzf" - (invoke "make")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/share")) - (with-directory-excursion "src/github.com/junegunn/fzf" - (invoke "make" "install") - (copy-recursively "bin" (string-append out "/bin")) - (copy-recursively "man" (string-append out "/share/man")) - (copy-recursively "shell" (string-append out "/share/fzf"))))))))) + #:phases (modify-phases %standard-phases + (add-before 'build 'setup-env + (lambda _ + (setenv "FZF_VERSION" + ,version) + (setenv "FZF_REVISION" + ,version))) + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/junegunn/fzf" + (invoke "make")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/share")) + (with-directory-excursion "src/github.com/junegunn/fzf" + (invoke "make" "install") + (copy-recursively "bin" + (string-append out "/bin")) + (copy-recursively "man" + (string-append out "/share/man")) + (copy-recursively "shell" + (string-append out "/share/fzf"))))))))) (synopsis "Command line fuzzy finder") (description "@command{fzf} is a general purpose command line fuzzy finder. It's an @@ -113,23 +116,30 @@ files, command history, processes, hostnames, bookmarks, git commits, etc..") "1l5vla2wyzcp96xxh41l4fsss23rshm8h7xnwkrziwa45y6jy7hj")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (func-path (string-append out "/share/zsh/site-functions")) - (install-path (string-append out "/lib/spaceship-prompt"))) - (for-each mkdir-p `(,func-path ,install-path)) - (for-each (lambda (dir) - (copy-recursively dir (string-append install-path "/" dir))) - '("lib" "modules" "sections")) - (copy-file "spaceship.zsh" (string-append install-path "/spaceship.zsh")) - (symlink (string-append install-path "/spaceship.zsh") - (string-append func-path "/prompt_spaceship_setup")))))))) + `(#:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (func-path (string-append out + "/share/zsh/site-functions")) + (install-path (string-append out + "/lib/spaceship-prompt"))) + (for-each mkdir-p + `(,func-path ,install-path)) + (for-each (lambda (dir) + (copy-recursively dir + (string-append + install-path "/" dir))) + '("lib" "modules" "sections")) + (copy-file "spaceship.zsh" + (string-append install-path + "/spaceship.zsh")) + (symlink (string-append install-path "/spaceship.zsh") + (string-append func-path + "/prompt_spaceship_setup")))))))) (synopsis "Zsh prompt for Astronauts") (description "Spaceship is a minimalistic, powerful and extremely customizable diff --git a/rekahsoft-gnu/packages/terraform.scm b/rekahsoft-gnu/packages/terraform.scm index 78980eb..8e68749 100644 --- a/rekahsoft-gnu/packages/terraform.scm +++ b/rekahsoft-gnu/packages/terraform.scm @@ -17,7 +17,8 @@ ;;; . (define-module (rekahsoft-gnu packages terraform) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages golang) #:use-module (guix utils) @@ -29,12 +30,11 @@ #:use-module (rekahsoft-gnu packages golang)) (define (search-rekahsoft-gnu-patches patch) - (parameterize - ((%patch-path - (map (lambda (directory) - (string-append directory "/rekahsoft-gnu/packages/patches")) - %load-path))) - (search-patches patch))) + (parameterize ((%patch-path (map (lambda (directory) + (string-append directory + "/rekahsoft-gnu/packages/patches")) + %load-path))) + (search-patches patch))) ;; TODO: Uses vendored dependencies (define-public terraform-0.13 @@ -46,27 +46,27 @@ (uri (git-reference (url "https://github.com/hashicorp/terraform") (commit (string-append "v" version)))) - (patches (search-rekahsoft-gnu-patches "terraform-provider-path.patch")) + (patches (search-rekahsoft-gnu-patches + "terraform-provider-path.patch")) (file-name (git-file-name name version)) (sha256 (base32 "0a4f32g6irmjnfqa8p0ydnlk1hk2749ifp4r7dalxl4687qzxz17")))) (build-system go-build-system) - (native-inputs - `(("go-gox" ,go-github-com-mitchellh-gox))) + (native-inputs `(("go-gox" ,go-github-com-mitchellh-gox))) (native-search-paths (list (search-path-specification (variable "SSL_CERT_DIR") - (separator #f) ;single entry + (separator #f) ;single entry (files '("etc/ssl/certs"))) (search-path-specification (variable "SSL_CERT_FILE") (file-type 'regular) - (separator #f) ;single entry + (separator #f) ;single entry (files '("etc/ssl/certs/ca-certificates.crt"))) (search-path-specification (variable "GUIX_TERRAFORM_PLUGIN_DIR") - (separator #f) ;single entry + (separator #f) ;single entry (files '("libexec/terraform"))))) (arguments `(#:import-path "github.com/hashicorp/terraform" @@ -74,36 +74,37 @@ #:modules ((guix build go-build-system) (guix build utils) (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/hashicorp/terraform" - (setenv "TF_RELEASE" "") - (setenv "XC_OS" "linux") - (setenv "XC_ARCH" - (let ((system ,(or (%current-target-system) - (%current-system)))) - (cond - ((string-prefix? "x86_64" system) - "amd64") - ((string-prefix? "i686" system) - "386") - (else "")))) - (invoke "./scripts/build.sh")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (version (last (string-split out #\-))) - (components (string-split version #\.)) - (major+minor (take components 2)) - (executable (string-append "terraform-" (string-join major+minor ".")))) - (with-directory-excursion "src/github.com/hashicorp/terraform/bin" - (rename-file "terraform" executable) - (install-file executable bin) - #t))))))) - (synopsis "Safely and predictably create, change, and improve infrastructure") + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/hashicorp/terraform" + (setenv "TF_RELEASE" "") + (setenv "XC_OS" "linux") + (setenv "XC_ARCH" + (let ((system ,(or (%current-target-system) + (%current-system)))) + (cond + ((string-prefix? "x86_64" system) + "amd64") + ((string-prefix? "i686" system) + "386") + (else "")))) + (invoke "./scripts/build.sh")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (version (last (string-split out #\-))) + (components (string-split version #\.)) + (major+minor (take components 2)) + (executable (string-append "terraform-" + (string-join + major+minor ".")))) + (with-directory-excursion "src/github.com/hashicorp/terraform/bin" + (rename-file "terraform" executable) + (install-file executable bin) #t))))))) + (synopsis + "Safely and predictably create, change, and improve infrastructure") (description "Terraform is a tool for building, changing, and versioning infrastructure safely and efficiently. Terraform can manage existing and @@ -113,76 +114,91 @@ popular service providers as well as custom in-house solutions.") (define-public terraform-0.12 (package/inherit terraform-0.13 - (name "terraform") - (version "0.12.31") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hashicorp/terraform") - (commit (string-append "v" version)))) - (patches (search-rekahsoft-gnu-patches "terraform-provider-path.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 - "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg")))))) + (name "terraform") + (version "0.12.31") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/hashicorp/terraform") + (commit (string-append "v" version)))) + (patches (search-rekahsoft-gnu-patches + "terraform-provider-path.patch")) + (file-name (git-file-name name version)) + (sha256 (base32 + "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg")))))) (define-public terraform-0.11 (package/inherit terraform-0.13 - (name "terraform") - (version "0.11.15") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hashicorp/terraform") - (commit (string-append "v" version)))) - (patches (search-rekahsoft-gnu-patches "terraform-provider-path.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15qs7zwz18cmp8xnkf9rwqmracy7va1n480apxiaijrgvai8sv8n")))))) + (name "terraform") + (version "0.11.15") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/hashicorp/terraform") + (commit (string-append "v" version)))) + (patches (search-rekahsoft-gnu-patches + "terraform-provider-path.patch")) + (file-name (git-file-name name version)) + (sha256 (base32 + "15qs7zwz18cmp8xnkf9rwqmracy7va1n480apxiaijrgvai8sv8n")))))) (define* (wrap-terraform terraform - #:optional - (name (string-append (package-name terraform) "-wrapper"))) + #:optional (name (string-append (package-name + terraform) + "-wrapper"))) (package/inherit terraform - (name name) - (source #f) - (build-system trivial-build-system) - (outputs '("out")) - (propagated-inputs `(("terraform" ,terraform))) - (arguments - `(#:modules ((guix build utils) - (srfi srfi-1)) - #:builder - (begin - (use-modules (guix build utils) - (srfi srfi-1)) - (let* ((out (assoc-ref %outputs "out")) - (bin (string-append out "/bin")) - (terraform (string-append (assoc-ref %build-inputs "terraform") "/bin/")) - (version (last (string-split out #\-))) - (components (string-split version #\.)) - (major+minor (take components 2))) - (mkdir-p bin) - (symlink (string-append terraform "terraform-" (string-join major+minor ".")) - (string-append bin "/" "terraform")) - #t)))) - (synopsis "Wrapper for terraform commands") - (description - "This package provides wrappers for the commands of Terraform@tie{}MAJOR.MINOR.x such + (name name) + (source #f) + (build-system trivial-build-system) + (outputs '("out")) + (propagated-inputs `(("terraform" ,terraform))) + (arguments `(#:modules ((guix build utils) + (srfi srfi-1)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-1)) + (let* ((out (assoc-ref %outputs + "out")) + (bin (string-append out + "/bin")) + (terraform (string-append (assoc-ref + %build-inputs + "terraform") + "/bin/")) + (version (last (string-split + out #\-))) + (components (string-split + version #\.)) + (major+minor (take + components 2))) + (mkdir-p bin) + (symlink (string-append + terraform "terraform-" + (string-join + major+minor ".")) + (string-append bin "/" + "terraform")) #t)))) + (synopsis "Wrapper for terraform commands") + (description + "This package provides wrappers for the commands of Terraform@tie{}MAJOR.MINOR.x such that they can be invoked under their usual name---e.g., @command{terraform} instead of @command{terraform-MAJOR.MINOR}."))) -(define-public terraform-wrapper-0.13 (wrap-terraform terraform-0.13)) -(define-public terraform-wrapper-0.12 (wrap-terraform terraform-0.12)) -(define-public terraform-wrapper-0.11 (wrap-terraform terraform-0.11)) +(define-public terraform-wrapper-0.13 + (wrap-terraform terraform-0.13)) +(define-public terraform-wrapper-0.12 + (wrap-terraform terraform-0.12)) +(define-public terraform-wrapper-0.11 + (wrap-terraform terraform-0.11)) (define terraform-provider-phases '(modify-phases %standard-phases (add-after 'remove-go-references 'change-out (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (original-path (string-append out "/bin")) + (original-path (string-append out "/bin")) (install-path (string-append out "/libexec/terraform"))) (mkdir-p install-path) (copy-recursively original-path install-path) @@ -190,564 +206,625 @@ instead of @command{terraform-MAJOR.MINOR}."))) (define (make-terraform-provider package) (package/inherit package - (arguments - (substitute-keyword-arguments (package-arguments package) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (delete 'change-out) ; Delete phase if it already exists - (add-after 'install 'change-out - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (tf-provider-name ,(package-name package)) - (tf-provider-name+version (string-append tf-provider-name "_v" ,(package-version package))) - (libexec (string-append out "/libexec/terraform"))) - (mkdir-p libexec) - (rename-file (string-append bin "/" tf-provider-name) - (string-append libexec "/" tf-provider-name+version)) - (delete-file-recursively bin)))))))))) + (arguments (substitute-keyword-arguments (package-arguments + package) + ((#:phases phases + '%standard-phases) + `(modify-phases ,phases + (delete 'change-out) ;Delete phase if it already exists + (add-after 'install 'change-out + (lambda* (#:key outputs + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (tf-provider-name ,(package-name + package)) + (tf-provider-name+version (string-append + tf-provider-name + "_v" + ,(package-version + package))) + (libexec (string-append out + "/libexec/terraform"))) + (mkdir-p libexec) + (rename-file (string-append bin "/" + tf-provider-name) + (string-append libexec + "/" + tf-provider-name+version)) + (delete-file-recursively bin)))))))))) (define-public terraform-provider-aws - (make-terraform-provider - (package - (name "terraform-provider-aws") - (version "2.70.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-aws") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1swmkyi8yv1rpkzn283lm9kqjyzscvjfzm8smn0sxcniwx7002js")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-aws" - #:install-source? #f)) - (synopsis "@command{Terraform} AWS provider") - (description - "Terraform AWS provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-aws") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-aws") + (version "2.70.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-aws") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1swmkyi8yv1rpkzn283lm9kqjyzscvjfzm8smn0sxcniwx7002js")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-aws" + #:install-source? #f)) + (synopsis "@command{Terraform} AWS provider") + (description "Terraform AWS provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-aws") + (license license:mpl2.0)))) (define-public terraform-provider-template - (make-terraform-provider - (package - (name "terraform-provider-template") - (version "2.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-template") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-template" - #:install-source? #f)) - (synopsis "@command{Terraform} AWS provider") - (description - "Terraform template provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-template") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-template") + (version "2.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-template") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-template" + #:install-source? #f)) + (synopsis "@command{Terraform} AWS provider") + (description "Terraform template provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-template") + (license license:mpl2.0)))) (define-public terraform-provider-google - (make-terraform-provider - (package - (name "terraform-provider-google") - (version "2.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-google") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-google" - #:install-source? #f)) - (synopsis "Terraform Google Cloud Platform provider ") - (description - "Terraform Google Cloud Platform provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-google") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-google") + (version "2.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-google") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r4x7l20w8wb6a356vx71lra466p7hfww1jyv0bg7z1f015qs91l")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-google" + #:install-source? #f)) + (synopsis + "Terraform Google Cloud Platform provider ") + (description + "Terraform Google Cloud Platform provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-google") + (license license:mpl2.0)))) (define-public terraform-provider-kubernetes - (make-terraform-provider - (package - (name "terraform-provider-kubernetes") - (version "1.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-kubernetes") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fah2310hic2svjfya3051sv8sp5gwgrfc1y2ggdn66hjz0x6ir3")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-kubernetes" - #:install-source? #f)) - (synopsis "Terraform Kubernetes provider ") - (description - "Terraform Kubernetes provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-kubernetes") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-kubernetes") + (version "1.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-kubernetes") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fah2310hic2svjfya3051sv8sp5gwgrfc1y2ggdn66hjz0x6ir3")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-kubernetes" + #:install-source? #f)) + (synopsis "Terraform Kubernetes provider ") + (description "Terraform Kubernetes provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-kubernetes") + (license license:mpl2.0)))) (define-public terraform-provider-azurerm - (make-terraform-provider - (package - (name "terraform-provider-azurerm") - (version "1.30.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-azurerm") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-azurerm" - #:install-source? #f)) - (synopsis "Terraform Azure Resource Manager provider") - (description - "Terraform Azure Resource Manager provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-azurerm") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-azurerm") + (version "1.30.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-azurerm") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zxvj6k1xs151dik8yhjl31r563dsc7iykv32g10w5szyigvxqfd")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-azurerm" + #:install-source? #f)) + (synopsis + "Terraform Azure Resource Manager provider") + (description + "Terraform Azure Resource Manager provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-azurerm") + (license license:mpl2.0)))) (define-public terraform-provider-alicloud - (make-terraform-provider - (package - (name "terraform-provider-alicloud") - (version "1.46.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-alicloud") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0cndsc0k7mk5xmaakszbl680igxfvxzlcnrfr07qz6bk796p9sfp")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-alicloud" - #:install-source? #f)) - (synopsis "Terraform Alicloud provider") - (description - "Terraform Alicloud provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-alicloud") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-alicloud") + (version "1.46.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-alicloud") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cndsc0k7mk5xmaakszbl680igxfvxzlcnrfr07qz6bk796p9sfp")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-alicloud" + #:install-source? #f)) + (synopsis "Terraform Alicloud provider") + (description "Terraform Alicloud provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-alicloud") + (license license:mpl2.0)))) (define-public terraform-provider-vsphere - (make-terraform-provider - (package - (name "terraform-provider-vsphere") - (version "1.11.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-vsphere") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02qkm8n0z8v8xfjkvy5nkjc4p37xqp5xsds10b3b060vb5l6yfg4")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-vsphere" - #:install-source? #f)) - (synopsis "Terraform Vsphere provider") - (description - "Terraform Vsphere provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-vsphere") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-vsphere") + (version "1.11.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-vsphere") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02qkm8n0z8v8xfjkvy5nkjc4p37xqp5xsds10b3b060vb5l6yfg4")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-vsphere" + #:install-source? #f)) + (synopsis "Terraform Vsphere provider") + (description "Terraform Vsphere provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-vsphere") + (license license:mpl2.0)))) (define-public terraform-provider-cloudflare - (make-terraform-provider - (package - (name "terraform-provider-cloudflare") - (version "1.15.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-cloudflare") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-cloudflare" - #:install-source? #f)) - (synopsis "Terraform Cloudflare provider") - (description - "Terraform Cloudflare provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-cloudflare") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-cloudflare") + (version "1.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-cloudflare") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mb771dw5fw2s6jd63sybwza49axyj9967fl454m3sznhpl96y8z")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-cloudflare" + #:install-source? #f)) + (synopsis "Terraform Cloudflare provider") + (description "Terraform Cloudflare provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-cloudflare") + (license license:mpl2.0)))) (define-public terraform-provider-vault - (make-terraform-provider - (package - (name "terraform-provider-vault") - (version "1.9.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-vault") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "19ckfm89877s7jp8vssph9mdjr3srq4m6kc2zn2ky979775bi5lw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-vault" - #:install-source? #f)) - (synopsis "Terraform Vault provider") - (description - "Terraform Vault provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-vault") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-vault") + (version "1.9.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-vault") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19ckfm89877s7jp8vssph9mdjr3srq4m6kc2zn2ky979775bi5lw")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-vault" + #:install-source? #f)) + (synopsis "Terraform Vault provider") + (description "Terraform Vault provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-vault") + (license license:mpl2.0)))) (define-public terraform-provider-gitlab - (make-terraform-provider - (package - (name "terraform-provider-gitlab") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-gitlab") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-gitlab" - #:install-source? #f)) - (synopsis "Terraform Gitlab provider") - (description - "Terraform Gitlab provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-gitlab") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-gitlab") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-gitlab") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11j84kyw2lsqsn6ya070hx0k6igb3hhjl8zlnr4q3gpmv51y23qc")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-gitlab" + #:install-source? #f)) + (synopsis "Terraform Gitlab provider") + (description "Terraform Gitlab provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-gitlab") + (license license:mpl2.0)))) (define-public terraform-provider-github - (make-terraform-provider - (package - (name "terraform-provider-github") - (version "2.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-github") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-github" - #:install-source? #f)) - (synopsis "Terraform Github provider") - (description - "Terraform Github provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-github") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-github") + (version "2.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-github") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05ca0vw6s7q40zcs50mr6k2swwx3a3njd4dxdz00qki58hgb87y6")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-github" + #:install-source? #f)) + (synopsis "Terraform Github provider") + (description "Terraform Github provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-github") + (license license:mpl2.0)))) (define-public terraform-provider-digitalocean - (make-terraform-provider - (package - (name "terraform-provider-digitalocean") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-digitalocean") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x55clpy3i2jrnmdwlya82vd3aiyvrzpx5y57xjs29x232cygw7r")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-digitalocean" - #:install-source? #f)) - (synopsis "Terraform Digitalocean provider") - (description - "Terraform Digitalocean provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-digitalocean") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-digitalocean") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-digitalocean") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x55clpy3i2jrnmdwlya82vd3aiyvrzpx5y57xjs29x232cygw7r")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-digitalocean" + #:install-source? #f)) + (synopsis "Terraform Digitalocean provider") + (description "Terraform Digitalocean provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-digitalocean") + (license license:mpl2.0)))) (define-public terraform-provider-helm - (make-terraform-provider - (package - (name "terraform-provider-helm") - (version "0.9.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-helm") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1bni05ski94w3ihhf0jp3mk8dzkbm9jlgv6xb23403ppcbgy7s9d")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-helm" - #:install-source? #f)) - (synopsis "Terraform Helm provider") - (description - "Terraform Helm provider.") - (home-page "https://helm.com/terraform-providers/terraform-provider-helm") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-helm") + (version "0.9.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-helm") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bni05ski94w3ihhf0jp3mk8dzkbm9jlgv6xb23403ppcbgy7s9d")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-helm" + #:install-source? #f)) + (synopsis "Terraform Helm provider") + (description "Terraform Helm provider.") + (home-page + "https://helm.com/terraform-providers/terraform-provider-helm") + (license license:mpl2.0)))) (define-public terraform-provider-linode - (make-terraform-provider - (package - (name "terraform-provider-linode") - (version "1.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-linode") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0i2x0jd26qanziihlc38s7rxiab66ld2s5gz18rrmrbwhcl95fwj")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-linode" - #:install-source? #f)) - (synopsis "Terraform Linode provider") - (description - "Terraform Linode provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-linode") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-linode") + (version "1.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-linode") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i2x0jd26qanziihlc38s7rxiab66ld2s5gz18rrmrbwhcl95fwj")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-linode" + #:install-source? #f)) + (synopsis "Terraform Linode provider") + (description "Terraform Linode provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-linode") + (license license:mpl2.0)))) (define-public terraform-provider-random - (make-terraform-provider - (package - (name "terraform-provider-random") - (version "2.1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-random") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-random" - #:install-source? #f)) - (synopsis "Terraform random provider") - (description - "Terraform Random provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-random") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-random") + (version "2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-random") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "102bgd8s9yhm2ny2akv04mhwf5mphqhsxx9vxjbg7ygqnz9ka5nw")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-random" + #:install-source? #f)) + (synopsis "Terraform random provider") + (description "Terraform Random provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-random") + (license license:mpl2.0)))) (define-public terraform-provider-null - (make-terraform-provider - (package - (name "terraform-provider-null") - (version "3.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-null") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-null" - #:install-source? #f)) - (synopsis "Terraform null provider") - (description - "Terraform null provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-null") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-null") + (version "3.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-null") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-null" + #:install-source? #f)) + (synopsis "Terraform null provider") + (description "Terraform null provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-null") + (license license:mpl2.0)))) (define-public terraform-provider-null-2.1 - (make-terraform-provider - (package/inherit terraform-provider-null - (name "terraform-provider-null") - (version "2.1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-null") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2")))) - (description - "Terraform null provider. Supports terraform => 0.11.")))) + (make-terraform-provider (package/inherit terraform-provider-null + (name "terraform-provider-null") + (version "2.1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-null") + (commit (string-append + "v" + version)))) + (file-name (git-file-name + name version)) + (sha256 (base32 + "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2")))) + (description + "Terraform null provider. Supports terraform => 0.11.")))) (define-public terraform-provider-heroku - (make-terraform-provider - (package - (name "terraform-provider-heroku") - (version "2.0.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-heroku") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-heroku" - #:install-source? #f)) - (synopsis "Terraform heroku provider") - (description - "Terraform Heroku provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-heroku") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-heroku") + (version "2.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-heroku") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "161pc6s4ifzi58cx32sdk9nan4kz6gn3mch1pnmp03f6390s2pcm")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-heroku" + #:install-source? #f)) + (synopsis "Terraform heroku provider") + (description "Terraform Heroku provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-heroku") + (license license:mpl2.0)))) (define-public terraform-provider-nomad - (make-terraform-provider - (package - (name "terraform-provider-nomad") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-nomad") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-nomad" - #:install-source? #f)) - (synopsis "Terraform nomad provider") - (description - "Terraform Nomad provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-nomad") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-nomad") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-nomad") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04dh7gas6viny6bkx89fkwmxrw101b8bmw14m2mzfkxn70cl2na4")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-nomad" + #:install-source? #f)) + (synopsis "Terraform nomad provider") + (description "Terraform Nomad provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-nomad") + (license license:mpl2.0)))) (define-public terraform-provider-postgresql - (make-terraform-provider - (package - (name "terraform-provider-postgresql") - (version "0.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-postgresql") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-postgresql" - #:install-source? #f)) - (synopsis "Terraform postgresql provider") - (description - "Terraform Postgresql provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-postgresql") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-postgresql") + (version "0.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-postgresql") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fywq1vzm8fcd0jcvzx1n3jilrk0r6ylqz9r4dwsyc64iqvmrpps")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-postgresql" + #:install-source? #f)) + (synopsis "Terraform postgresql provider") + (description "Terraform Postgresql provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-postgresql") + (license license:mpl2.0)))) (define-public terraform-provider-grafana - (make-terraform-provider - (package - (name "terraform-provider-grafana") - (version "1.4.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-grafana") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-grafana" - #:install-source? #f)) - (synopsis "Terraform grafana provider") - (description - "Terraform Grafana provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-grafana") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-grafana") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-grafana") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y41yhp82phgw83frkgrjzpymsys2abvdwa1n905rz7i15ybasqc")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-grafana" + #:install-source? #f)) + (synopsis "Terraform grafana provider") + (description "Terraform Grafana provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-grafana") + (license license:mpl2.0)))) (define-public terraform-provider-docker - (make-terraform-provider - (package - (name "terraform-provider-docker") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-docker") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-docker" - #:install-source? #f)) - (synopsis "Terraform docker provider") - (description - "Terraform Docker provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-docker") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-docker") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-docker") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w69kjlrgy4397c9nz3llqsqcjzchwqw1ksw4wg34xnnq20pd4ql")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-docker" + #:install-source? #f)) + (synopsis "Terraform docker provider") + (description "Terraform Docker provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-docker") + (license license:mpl2.0)))) (define-public terraform-provider-openstack - (make-terraform-provider - (package - (name "terraform-provider-openstack") - (version "1.19.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/terraform-providers/terraform-provider-openstack") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/terraform-providers/terraform-provider-openstack" - #:install-source? #f)) - (synopsis "Terraform openstack provider") - (description - "Terraform Openstack provider.") - (home-page "https://github.com/terraform-providers/terraform-provider-openstack") - (license license:mpl2.0)))) + (make-terraform-provider (package + (name "terraform-provider-openstack") + (version "1.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/terraform-providers/terraform-provider-openstack") + (commit (string-append "v" + version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y9b9h523zflq4z9cwjgfa0l92j4ac5pc1r6vja1aw3gg2ln80x9")))) + (build-system go-build-system) + (arguments + `(#:import-path + "github.com/terraform-providers/terraform-provider-openstack" + #:install-source? #f)) + (synopsis "Terraform openstack provider") + (description "Terraform Openstack provider.") + (home-page + "https://github.com/terraform-providers/terraform-provider-openstack") + (license license:mpl2.0)))) diff --git a/rekahsoft-gnu/packages/virtualization.scm b/rekahsoft-gnu/packages/virtualization.scm index 2eb585e..be05695 100644 --- a/rekahsoft-gnu/packages/virtualization.scm +++ b/rekahsoft-gnu/packages/virtualization.scm @@ -97,7 +97,8 @@ #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) + #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -117,16 +118,14 @@ (base32 "05xbxldhm3cgdjysidzpc8wnq17mgd84mq60jmbq6zcc9jl21axh")))) (build-system go-build-system) - (native-inputs - `(("gpgme" ,gpgme) - ("pkg-config" ,pkg-config) - ("libassuan" ,libassuan) - ("libseccomp" ,libseccomp) - ("go-md2man" ,go-md2man))) - (propagated-inputs - `(("runc" ,runc) - ("conmon" ,conmon) - ("slirp4netns" ,slirp4netns))) + (native-inputs `(("gpgme" ,gpgme) + ("pkg-config" ,pkg-config) + ("libassuan" ,libassuan) + ("libseccomp" ,libseccomp) + ("go-md2man" ,go-md2man))) + (propagated-inputs `(("runc" ,runc) + ("conmon" ,conmon) + ("slirp4netns" ,slirp4netns))) (arguments '(#:import-path "github.com/containers/libpod" #:phases (modify-phases %standard-phases @@ -134,15 +133,14 @@ (lambda _ (with-directory-excursion "src/github.com/containers/libpod" (setenv "HOME" "/tmp") - (invoke "make" "all" - "GIT_COMMIT=NONE" + (invoke "make" "all" "GIT_COMMIT=NONE" "GIT_BRANCH=NONE")))) ;; FIXME: tests currently require docker ;; (replace 'check - ;; (lambda _ - ;; (with-directory-excursion "src/github.com/containers/libpod" - ;; (setenv "HOME" "/tmp") - ;; (invoke "make" "test")))) + ;; (lambda _ + ;; (with-directory-excursion "src/github.com/containers/libpod" + ;; (setenv "HOME" "/tmp") + ;; (invoke "make" "test")))) (delete 'check) (replace 'install (lambda* (#:key outputs #:allow-other-keys) @@ -174,9 +172,8 @@ volumes.") (base32 "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id")))) (build-system go-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib))) + (native-inputs `(("pkg-config" ,pkg-config) + ("glib" ,glib))) (arguments '(#:import-path "github.com/containers/conmon" #:phases (modify-phases %standard-phases @@ -184,9 +181,7 @@ volumes.") (lambda _ (with-directory-excursion "src/github.com/containers/conmon" (setenv "HOME" "/tmp") - (invoke "make" "all" - "CC=gcc" - "GIT_COMMIT=NONE" + (invoke "make" "all" "CC=gcc" "GIT_COMMIT=NONE" "GIT_BRANCH=NONE")))) (delete 'check) (replace 'install @@ -217,41 +212,35 @@ container.") (base32 "19yf93pq4vw24h76kl32c6ryvg5fp5mixakw9c6sqydf7m74z9i8")))) (build-system go-build-system) - (inputs - `(("git" ,git))) - (propagated-inputs - `(("runc" ,runc) - ("cni-plugins" ,cni-plugins))) - (native-inputs - `(("gpgme" ,gpgme) - ("pkg-config" ,pkg-config) - ("libassuan" ,libassuan) - ("libseccomp" ,libseccomp) - ("lvm2" ,lvm2) - ("eudev" ,eudev) - ("glib" ,glib) - ("btrfs-progs" ,btrfs-progs) - ("libostree" ,libostree) - ("libselinux" ,libselinux) - ("go-md2man" ,go-md2man))) + (inputs `(("git" ,git))) + (propagated-inputs `(("runc" ,runc) + ("cni-plugins" ,cni-plugins))) + (native-inputs `(("gpgme" ,gpgme) + ("pkg-config" ,pkg-config) + ("libassuan" ,libassuan) + ("libseccomp" ,libseccomp) + ("lvm2" ,lvm2) + ("eudev" ,eudev) + ("glib" ,glib) + ("btrfs-progs" ,btrfs-progs) + ("libostree" ,libostree) + ("libselinux" ,libselinux) + ("go-md2man" ,go-md2man))) (arguments '(#:import-path "github.com/containers/buildah" #:install-source? #f - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/containers/buildah" - (setenv "HOME" "/tmp") - (invoke "make" "binary" "docs" "GIT_COMMIT=NONE")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion "src/github.com/containers/buildah" - (invoke "make" "install" - "GIT_COMMIT=NONE" - (string-append "PREFIX=" out))) - #t)))))) + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/containers/buildah" + (setenv "HOME" "/tmp") + (invoke "make" "binary" "docs" "GIT_COMMIT=NONE")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "src/github.com/containers/buildah" + (invoke "make" "install" "GIT_COMMIT=NONE" + (string-append "PREFIX=" out))) #t)))))) (synopsis "Tool that facilitates building OCI images") (description "Buildah provides a command line tool for creating and manipulating OCI @@ -278,8 +267,7 @@ container images.") #:install-source? #f #:phases %standard-phases)) (synopsis "Converts markdown into roff (man pages)") - (description - "Uses blackfriday to process markdown into man pages.") + (description "Uses blackfriday to process markdown into man pages.") (home-page "https://github.com/cpuguy83/go-md2man") (license license:expat))) @@ -300,29 +288,26 @@ container images.") (arguments '(#:import-path "github.com/containernetworking/plugins" #:install-source? #f - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/containernetworking/plugins" - (setenv "HOME" "/tmp") - (invoke "./build_linux.sh")))) - (delete 'check) ;; Tests currently use sudo - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (copy-recursively - "src/github.com/containernetworking/plugins/bin" - (string-append out "/usr/lib/cni")) - #t)))))) - ;; FIXME: Enable tests - ;; (replace 'check - ;; (lambda _ - ;; (with-directory-excursion "src/github.com/containernetworking/plugins" - ;; (invoke "./test_linux.sh")))) + #:phases (modify-phases %standard-phases + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/containernetworking/plugins" + (setenv "HOME" "/tmp") + (invoke "./build_linux.sh")))) + (delete 'check) ;Tests currently use sudo + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively + "src/github.com/containernetworking/plugins/bin" + (string-append out "/usr/lib/cni")) #t)))))) + ;; FIXME: Enable tests + ;; (replace 'check + ;; (lambda _ + ;; (with-directory-excursion "src/github.com/containernetworking/plugins" + ;; (invoke "./test_linux.sh")))) (synopsis "Some standard networking plugins, maintained by the CNI team") - (description - "A collection of CNI networking plugins.") + (description "A collection of CNI networking plugins.") (home-page "https://github.com/containernetworking/plugins") (license license:asl2.0))) @@ -333,7 +318,8 @@ container images.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/rootless-containers/slirp4netns.git") + (url + "https://github.com/rootless-containers/slirp4netns.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -343,14 +329,12 @@ container images.") (arguments ;; TODO: Tests currently fail '(#:tests? #f)) - (inputs - `(("glib" ,glib) - ("libcap" ,libcap) - ("libseccomp" ,libseccomp))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake))) + (inputs `(("glib" ,glib) + ("libcap" ,libcap) + ("libseccomp" ,libseccomp))) + (native-inputs `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake))) (synopsis "User-mode networking for unprivileged network namespaces") (description "slirp4netns allows connecting a network namespace to the Internet in a