guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/07: gnu: Remove ".git" from "https://github/…/….git".


From: guix-commits
Subject: 04/07: gnu: Remove ".git" from "https://github/…/….git".
Date: Sun, 12 Jul 2020 19:03:24 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit b0e7b6992f3f845e83cfbca4d700b51dba50b4d5
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Jul 12 22:53:28 2020 +0200

    gnu: Remove ".git" from "https://github/…/….git";.
    
    Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix
    swh) would sometimes return #f for these because the ".git" URLs are
    redirects to the non-".git" URLs.  Consequently, 'guix lint -c archival'
    would keep saying "scheduled Software Heritage archival"; likewise, the
    fallback download code would fail.
    
    * gnu/packages/ada.scm,
    gnu/packages/admin.scm,
    gnu/packages/aidc.scm,
    gnu/packages/algebra.scm,
    gnu/packages/android.scm,
    gnu/packages/animation.scm,
    gnu/packages/arcan.scm,
    gnu/packages/assembly.scm,
    gnu/packages/audio.scm,
    gnu/packages/authentication.scm,
    gnu/packages/avr.scm,
    gnu/packages/axoloti.scm,
    gnu/packages/backup.scm,
    gnu/packages/bash.scm,
    gnu/packages/benchmark.scm,
    gnu/packages/bioconductor.scm,
    gnu/packages/bioinformatics.scm,
    gnu/packages/bittorrent.scm,
    gnu/packages/boost.scm,
    gnu/packages/build-tools.scm,
    gnu/packages/c.scm,
    gnu/packages/calendar.scm,
    gnu/packages/cdrom.scm,
    gnu/packages/check.scm,
    gnu/packages/chemistry.scm,
    gnu/packages/chez.scm,
    gnu/packages/clojure.scm,
    gnu/packages/code.scm,
    gnu/packages/compression.scm,
    gnu/packages/compton.scm,
    gnu/packages/coq.scm,
    gnu/packages/cpp.scm,
    gnu/packages/cran.scm,
    gnu/packages/crypto.scm,
    gnu/packages/curl.scm,
    gnu/packages/databases.scm,
    gnu/packages/datastructures.scm,
    gnu/packages/debug.scm,
    gnu/packages/disk.scm,
    gnu/packages/distributed.scm,
    gnu/packages/django.scm,
    gnu/packages/dlang.scm,
    gnu/packages/dns.scm,
    gnu/packages/docker.scm,
    gnu/packages/education.scm,
    gnu/packages/efi.scm,
    gnu/packages/elixir.scm,
    gnu/packages/emacs-xyz.scm,
    gnu/packages/embedded.scm,
    gnu/packages/emulators.scm,
    gnu/packages/engineering.scm,
    gnu/packages/erlang.scm,
    gnu/packages/fabric-management.scm,
    gnu/packages/file-systems.scm,
    gnu/packages/finance.scm,
    gnu/packages/firmware.scm,
    gnu/packages/flashing-tools.scm,
    gnu/packages/fonts.scm,
    gnu/packages/fontutils.scm,
    gnu/packages/fpga.scm,
    gnu/packages/game-development.scm,
    gnu/packages/games.scm,
    gnu/packages/genealogy.scm,
    gnu/packages/genimage.scm,
    gnu/packages/geo.scm,
    gnu/packages/gimp.scm,
    gnu/packages/gl.scm,
    gnu/packages/gnome-xyz.scm,
    gnu/packages/gnome.scm,
    gnu/packages/gnuzilla.scm,
    gnu/packages/golang.scm,
    gnu/packages/gpodder.scm,
    gnu/packages/graph.scm,
    gnu/packages/graphics.scm,
    gnu/packages/graphviz.scm,
    gnu/packages/groff.scm,
    gnu/packages/groovy.scm,
    gnu/packages/gtk.scm,
    gnu/packages/guile-xyz.scm,
    gnu/packages/guile.scm,
    gnu/packages/hardware.scm,
    gnu/packages/haskell-apps.scm,
    gnu/packages/haskell-xyz.scm,
    gnu/packages/hexedit.scm,
    gnu/packages/i2p.scm,
    gnu/packages/ibus.scm,
    gnu/packages/image-processing.scm,
    gnu/packages/image-viewers.scm,
    gnu/packages/image.scm,
    gnu/packages/ipfs.scm,
    gnu/packages/java-graphics.scm,
    gnu/packages/java-maths.scm,
    gnu/packages/java.scm,
    gnu/packages/javascript.scm,
    gnu/packages/jrnl.scm,
    gnu/packages/julia.scm,
    gnu/packages/jupyter.scm,
    gnu/packages/kodi.scm,
    gnu/packages/language.scm,
    gnu/packages/lego.scm,
    gnu/packages/less.scm,
    gnu/packages/libusb.scm,
    gnu/packages/linux.scm,
    gnu/packages/lirc.scm,
    gnu/packages/lisp-xyz.scm,
    gnu/packages/llvm.scm,
    gnu/packages/logging.scm,
    gnu/packages/lolcode.scm,
    gnu/packages/lua.scm,
    gnu/packages/lxde.scm,
    gnu/packages/lxqt.scm,
    gnu/packages/machine-learning.scm,
    gnu/packages/mail.scm,
    gnu/packages/markup.scm,
    gnu/packages/maths.scm,
    gnu/packages/maven.scm,
    gnu/packages/mes.scm,
    gnu/packages/messaging.scm,
    gnu/packages/monitoring.scm,
    gnu/packages/mpd.scm,
    gnu/packages/music.scm,
    gnu/packages/networking.scm,
    gnu/packages/node-xyz.scm,
    gnu/packages/ocaml.scm,
    gnu/packages/ocr.scm,
    gnu/packages/onc-rpc.scm,
    gnu/packages/opencl.scm,
    gnu/packages/opencog.scm,
    gnu/packages/pantheon.scm,
    gnu/packages/password-utils.scm,
    gnu/packages/patchutils.scm,
    gnu/packages/pdf.scm,
    gnu/packages/perl6.scm,
    gnu/packages/phabricator.scm,
    gnu/packages/popt.scm,
    gnu/packages/printers.scm,
    gnu/packages/prolog.scm,
    gnu/packages/protobuf.scm,
    gnu/packages/pulseaudio.scm,
    gnu/packages/python-crypto.scm,
    gnu/packages/python-web.scm,
    gnu/packages/python-xyz.scm,
    gnu/packages/qt.scm,
    gnu/packages/radio.scm,
    gnu/packages/rails.scm,
    gnu/packages/rdf.scm,
    gnu/packages/rednotebook.scm,
    gnu/packages/rpc.scm,
    gnu/packages/rsync.scm,
    gnu/packages/ruby.scm,
    gnu/packages/rust.scm,
    gnu/packages/scheme.scm,
    gnu/packages/screen.scm,
    gnu/packages/security-token.scm,
    gnu/packages/selinux.scm,
    gnu/packages/serialization.scm,
    gnu/packages/shells.scm,
    gnu/packages/shellutils.scm,
    gnu/packages/simh.scm,
    gnu/packages/sml.scm,
    gnu/packages/ssh.scm,
    gnu/packages/statistics.scm,
    gnu/packages/stenography.scm,
    gnu/packages/sync.scm,
    gnu/packages/syncthing.scm,
    gnu/packages/synergy.scm,
    gnu/packages/telephony.scm,
    gnu/packages/terminals.scm,
    gnu/packages/tex.scm,
    gnu/packages/texinfo.scm,
    gnu/packages/text-editors.scm,
    gnu/packages/textutils.scm,
    gnu/packages/time.scm,
    gnu/packages/tmux.scm,
    gnu/packages/tor.scm,
    gnu/packages/toys.scm,
    gnu/packages/version-control.scm,
    gnu/packages/video.scm,
    gnu/packages/vim.scm,
    gnu/packages/virtualization.scm,
    gnu/packages/vlang.scm,
    gnu/packages/vnc.scm,
    gnu/packages/vpn.scm,
    gnu/packages/web-browsers.scm,
    gnu/packages/web.scm,
    gnu/packages/wireservice.scm,
    gnu/packages/wm.scm,
    gnu/packages/wxwidgets.scm,
    gnu/packages/xdisorg.scm,
    gnu/packages/xml.scm,
    gnu/packages/xorg.scm,
    tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
---
 gnu/packages/ada.scm               |   4 +-
 gnu/packages/admin.scm             |  40 +-
 gnu/packages/aidc.scm              |   4 +-
 gnu/packages/algebra.scm           |  16 +-
 gnu/packages/android.scm           |   4 +-
 gnu/packages/animation.scm         |   2 +-
 gnu/packages/arcan.scm             |   6 +-
 gnu/packages/assembly.scm          |   6 +-
 gnu/packages/audio.scm             |  48 +--
 gnu/packages/authentication.scm    |   2 +-
 gnu/packages/avr.scm               |   2 +-
 gnu/packages/axoloti.scm           |   6 +-
 gnu/packages/backup.scm            |   6 +-
 gnu/packages/bash.scm              |   4 +-
 gnu/packages/benchmark.scm         |   4 +-
 gnu/packages/bioconductor.scm      |   6 +-
 gnu/packages/bioinformatics.scm    | 232 +++++-----
 gnu/packages/bittorrent.scm        |   8 +-
 gnu/packages/boost.scm             |   4 +-
 gnu/packages/build-tools.scm       |   2 +-
 gnu/packages/c.scm                 |   6 +-
 gnu/packages/calendar.scm          |   2 +-
 gnu/packages/cdrom.scm             |   4 +-
 gnu/packages/check.scm             |   6 +-
 gnu/packages/chemistry.scm         |   4 +-
 gnu/packages/chez.scm              |  14 +-
 gnu/packages/clojure.scm           |  10 +-
 gnu/packages/code.scm              |  12 +-
 gnu/packages/compression.scm       |  18 +-
 gnu/packages/compton.scm           |   4 +-
 gnu/packages/coq.scm               |   8 +-
 gnu/packages/cpp.scm               |  14 +-
 gnu/packages/cran.scm              |   6 +-
 gnu/packages/crypto.scm            |   4 +-
 gnu/packages/curl.scm              |   2 +-
 gnu/packages/databases.scm         |  10 +-
 gnu/packages/datastructures.scm    |   6 +-
 gnu/packages/debug.scm             |   4 +-
 gnu/packages/disk.scm              |  12 +-
 gnu/packages/distributed.scm       |   2 +-
 gnu/packages/django.scm            |   6 +-
 gnu/packages/dlang.scm             |  18 +-
 gnu/packages/dns.scm               |   4 +-
 gnu/packages/docker.scm            |  12 +-
 gnu/packages/education.scm         |   2 +-
 gnu/packages/efi.scm               |   2 +-
 gnu/packages/elixir.scm            |   2 +-
 gnu/packages/emacs-xyz.scm         | 856 ++++++++++++++++++-------------------
 gnu/packages/embedded.scm          |  20 +-
 gnu/packages/emulators.scm         |  44 +-
 gnu/packages/engineering.scm       |  24 +-
 gnu/packages/erlang.scm            |   2 +-
 gnu/packages/fabric-management.scm |   2 +-
 gnu/packages/file-systems.scm      |   6 +-
 gnu/packages/finance.scm           |  20 +-
 gnu/packages/firmware.scm          |   4 +-
 gnu/packages/flashing-tools.scm    |  12 +-
 gnu/packages/fonts.scm             |  20 +-
 gnu/packages/fontutils.scm         |   4 +-
 gnu/packages/fpga.scm              |   6 +-
 gnu/packages/game-development.scm  |  18 +-
 gnu/packages/games.scm             |  84 ++--
 gnu/packages/genealogy.scm         |   2 +-
 gnu/packages/genimage.scm          |   2 +-
 gnu/packages/geo.scm               |  12 +-
 gnu/packages/gimp.scm              |   4 +-
 gnu/packages/gl.scm                |   6 +-
 gnu/packages/gnome-xyz.scm         |  16 +-
 gnu/packages/gnome.scm             |  18 +-
 gnu/packages/gnuzilla.scm          |   2 +-
 gnu/packages/golang.scm            | 120 +++---
 gnu/packages/gpodder.scm           |   2 +-
 gnu/packages/graph.scm             |   8 +-
 gnu/packages/graphics.scm          |  12 +-
 gnu/packages/graphviz.scm          |   2 +-
 gnu/packages/groff.scm             |   2 +-
 gnu/packages/groovy.scm            |   2 +-
 gnu/packages/gtk.scm               |   4 +-
 gnu/packages/guile-xyz.scm         |  12 +-
 gnu/packages/guile.scm             |   2 +-
 gnu/packages/hardware.scm          |   4 +-
 gnu/packages/haskell-apps.scm      |   4 +-
 gnu/packages/haskell-xyz.scm       |   2 +-
 gnu/packages/hexedit.scm           |   2 +-
 gnu/packages/i2p.scm               |   2 +-
 gnu/packages/ibus.scm              |  50 +--
 gnu/packages/image-processing.scm  |   8 +-
 gnu/packages/image-viewers.scm     |   8 +-
 gnu/packages/image.scm             |  22 +-
 gnu/packages/ipfs.scm              |   6 +-
 gnu/packages/java-graphics.scm     |   2 +-
 gnu/packages/java-maths.scm        |   2 +-
 gnu/packages/java.scm              |  20 +-
 gnu/packages/javascript.scm        |   4 +-
 gnu/packages/jrnl.scm              |   2 +-
 gnu/packages/julia.scm             |   4 +-
 gnu/packages/jupyter.scm           |   2 +-
 gnu/packages/kodi.scm              |  10 +-
 gnu/packages/language.scm          |   2 +-
 gnu/packages/lego.scm              |   2 +-
 gnu/packages/less.scm              |   2 +-
 gnu/packages/libusb.scm            |   6 +-
 gnu/packages/linux.scm             |  40 +-
 gnu/packages/lirc.scm              |   2 +-
 gnu/packages/lisp-xyz.scm          | 246 +++++------
 gnu/packages/llvm.scm              |   2 +-
 gnu/packages/logging.scm           |   2 +-
 gnu/packages/lolcode.scm           |   2 +-
 gnu/packages/lua.scm               |  10 +-
 gnu/packages/lxde.scm              |   2 +-
 gnu/packages/lxqt.scm              |   2 +-
 gnu/packages/machine-learning.scm  |  24 +-
 gnu/packages/mail.scm              |  14 +-
 gnu/packages/markup.scm            |   6 +-
 gnu/packages/maths.scm             |  28 +-
 gnu/packages/maven.scm             |   2 +-
 gnu/packages/mes.scm               |   2 +-
 gnu/packages/messaging.scm         |  22 +-
 gnu/packages/monitoring.scm        |   4 +-
 gnu/packages/mpd.scm               |   2 +-
 gnu/packages/music.scm             |  94 ++--
 gnu/packages/networking.scm        |  26 +-
 gnu/packages/node-xyz.scm          |   2 +-
 gnu/packages/ocaml.scm             |  72 ++--
 gnu/packages/ocr.scm               |   2 +-
 gnu/packages/onc-rpc.scm           |   2 +-
 gnu/packages/opencl.scm            |  10 +-
 gnu/packages/opencog.scm           |  12 +-
 gnu/packages/pantheon.scm          |   6 +-
 gnu/packages/password-utils.scm    |   6 +-
 gnu/packages/patchutils.scm        |   2 +-
 gnu/packages/pdf.scm               |  10 +-
 gnu/packages/perl6.scm             |  22 +-
 gnu/packages/phabricator.scm       |   4 +-
 gnu/packages/popt.scm              |   2 +-
 gnu/packages/printers.scm          |   4 +-
 gnu/packages/prolog.scm            |   2 +-
 gnu/packages/protobuf.scm          |   4 +-
 gnu/packages/pulseaudio.scm        |   6 +-
 gnu/packages/python-crypto.scm     |   2 +-
 gnu/packages/python-web.scm        |   4 +-
 gnu/packages/python-xyz.scm        |  60 +--
 gnu/packages/qt.scm                |   2 +-
 gnu/packages/radio.scm             |  12 +-
 gnu/packages/rails.scm             |   4 +-
 gnu/packages/rdf.scm               |   2 +-
 gnu/packages/rednotebook.scm       |   2 +-
 gnu/packages/rpc.scm               |   6 +-
 gnu/packages/rsync.scm             |   2 +-
 gnu/packages/ruby.scm              |  56 +--
 gnu/packages/rust.scm              |   2 +-
 gnu/packages/scheme.scm            |   4 +-
 gnu/packages/screen.scm            |   2 +-
 gnu/packages/security-token.scm    |   4 +-
 gnu/packages/selinux.scm           |   4 +-
 gnu/packages/serialization.scm     |  10 +-
 gnu/packages/shells.scm            |   6 +-
 gnu/packages/shellutils.scm        |  12 +-
 gnu/packages/simh.scm              |   2 +-
 gnu/packages/sml.scm               |   2 +-
 gnu/packages/ssh.scm               |   6 +-
 gnu/packages/statistics.scm        |   4 +-
 gnu/packages/stenography.scm       |   2 +-
 gnu/packages/sync.scm              |   4 +-
 gnu/packages/syncthing.scm         |  24 +-
 gnu/packages/synergy.scm           |   2 +-
 gnu/packages/telephony.scm         |   8 +-
 gnu/packages/terminals.scm         |  22 +-
 gnu/packages/tex.scm               |   2 +-
 gnu/packages/texinfo.scm           |   2 +-
 gnu/packages/text-editors.scm      |   8 +-
 gnu/packages/textutils.scm         |   8 +-
 gnu/packages/time.scm              |   2 +-
 gnu/packages/tmux.scm              |  10 +-
 gnu/packages/tor.scm               |   2 +-
 gnu/packages/toys.scm              |   2 +-
 gnu/packages/version-control.scm   |  18 +-
 gnu/packages/video.scm             |  44 +-
 gnu/packages/vim.scm               |   4 +-
 gnu/packages/virtualization.scm    |   2 +-
 gnu/packages/vlang.scm             |   4 +-
 gnu/packages/vnc.scm               |   4 +-
 gnu/packages/vpn.scm               |   6 +-
 gnu/packages/web-browsers.scm      |   2 +-
 gnu/packages/web.scm               |  36 +-
 gnu/packages/wireservice.scm       |  10 +-
 gnu/packages/wm.scm                |  32 +-
 gnu/packages/wxwidgets.scm         |   2 +-
 gnu/packages/xdisorg.scm           |  36 +-
 gnu/packages/xml.scm               |  16 +-
 gnu/packages/xorg.scm              |   4 +-
 tests/lint.scm                     |   2 +-
 192 files changed, 1673 insertions(+), 1673 deletions(-)

diff --git a/gnu/packages/ada.scm b/gnu/packages/ada.scm
index a8c2bdc..e58b0d7 100644
--- a/gnu/packages/ada.scm
+++ b/gnu/packages/ada.scm
@@ -38,7 +38,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/AdaCore/langkit.git";)
+                      (url "https://github.com/AdaCore/langkit";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -70,7 +70,7 @@ Ada library with bindings for the C and Python programming 
languages.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/AdaCore/libadalang.git";)
+                      (url "https://github.com/AdaCore/libadalang";)
                       (commit commit)))
                 (sha256
                  (base32
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6d8d665..5a867d6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -147,7 +147,7 @@
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/nomius/ktsuss.git";)
+         (url "https://github.com/nomius/ktsuss";)
          (commit version)))
        (sha256
         (base32 "0q9931f9hp47v1n8scli4bdg2rkjpf5jf8v7jj2gdn83aia1r2hz"))
@@ -220,7 +220,7 @@ usual file attributes can be checked for inconsistencies.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Xfennec/progress.git";)
+             (url "https://github.com/Xfennec/progress";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"))
@@ -1488,7 +1488,7 @@ commands and their arguments.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Duncaen/OpenDoas.git";)
+                    (url "https://github.com/Duncaen/OpenDoas";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1916,7 +1916,7 @@ system is under heavy load.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dharple/detox.git";)
+                    (url "https://github.com/dharple/detox";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2106,7 +2106,7 @@ degradation and failure.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/adrianlopezroche/fdupes.git";)
+             (url "https://github.com/adrianlopezroche/fdupes";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2358,7 +2358,7 @@ lookup to YAML Mode.  You could enable the mode with 
@code{(add-hook
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/opsengine/cpulimit.git";)
+             (url "https://github.com/opsengine/cpulimit";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2397,7 +2397,7 @@ limits.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wting/autojump.git";)
+             (url "https://github.com/wting/autojump";)
              (commit (string-append "release-v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2443,7 +2443,7 @@ frequently used directories by typing only a small 
pattern.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/clvv/fasd.git";)
+                    (url "https://github.com/clvv/fasd";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2675,7 +2675,7 @@ results (ndiff), and a packet generation and response 
analysis tool (nping).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dagwieers/dstat.git";)
+             (url "https://github.com/dagwieers/dstat";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "dstat" version))
        (sha256
@@ -2727,7 +2727,7 @@ throughput (in the same interval).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nvbn/thefuck.git";)
+             (url "https://github.com/nvbn/thefuck";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2803,7 +2803,7 @@ produce uniform output across heterogeneous networks.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/valr/cbatticon.git";)
+             (url "https://github.com/valr/cbatticon";)
              (commit version)))
        (sha256
         (base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"))
@@ -2839,7 +2839,7 @@ the status of your battery in the system tray.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/TrilbyWhite/interrobang.git";)
+               (url "https://github.com/TrilbyWhite/interrobang";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2915,7 +2915,7 @@ Kerberos and Heimdal and FAST is supported with recent 
MIT Kerberos.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/linux-sunxi/sunxi-tools.git";)
+             (url "https://github.com/linux-sunxi/sunxi-tools";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "04f3jqg8ww4jxsf9c6ddcdgy2xbhkyp0b3l5f1hvvbv94p81rjxd"))
@@ -3020,7 +3020,7 @@ in order to be able to find it.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/aureliojargas/sedsed.git";)
+             (url "https://github.com/aureliojargas/sedsed";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3423,7 +3423,7 @@ on systems running the Linux kernel.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/robertdavidgraham/masscan.git";)
+             (url "https://github.com/robertdavidgraham/masscan";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3534,7 +3534,7 @@ launch daemons into the relevant nodes.")
               ;; We use git checkout to avoid github auto-generated tarballs
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hpc/Spindle.git";)
+                    (url "https://github.com/hpc/Spindle";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3745,7 +3745,7 @@ support forum.  It runs with the @code{/exec} command in 
most IRC clients.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pwr/Solaar.git";)
+                    (url "https://github.com/pwr/Solaar";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3958,7 +3958,7 @@ supplied by the user when logging in.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kellyjonbrazil/jc.git";)
+                    (url "https://github.com/kellyjonbrazil/jc";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3982,7 +3982,7 @@ file-types for easier parsing in scripts.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kellyjonbrazil/jtbl.git";)
+                    (url "https://github.com/kellyjonbrazil/jtbl";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4004,7 +4004,7 @@ text table representation to stdout.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/xwmx/hosts.git";)
+                    (url "https://github.com/xwmx/hosts";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 5648f5a..944ea04 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -91,7 +91,7 @@ characters, and is highly robust.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dmtx/libdmtx.git";)
+             (url "https://github.com/dmtx/libdmtx";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -163,7 +163,7 @@ Python as well as GUI widgets for GTK and Qt.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/nayuki/QR-Code-generator.git";)
+                     (url "https://github.com/nayuki/QR-Code-generator";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (patches (search-patches "qrcodegen-cpp-make-install.patch"))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index c9ff1b8..f8544e6 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -155,7 +155,7 @@ line applications.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/fplll/fplll.git";)
+                    (url "https://github.com/fplll/fplll";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -205,7 +205,7 @@ the real span of the lattice.")
        ;; Github instead.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fplll/fpylll.git";)
+             (url "https://github.com/fplll/fpylll";)
              (commit (string-append version "dev"))))
        (file-name (git-file-name name version))
        (sha256
@@ -499,7 +499,7 @@ fast arithmetic.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/fredrik-johansson/arb.git";)
+                    (url "https://github.com/fredrik-johansson/arb";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -544,7 +544,7 @@ real and complex numbers, with automatic, rigorous error 
control.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/fredrik-johansson/python-flint.git";)
+                    (url "https://github.com/fredrik-johansson/python-flint";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -737,7 +737,7 @@ syntax is similar to that of C, so basic usage is familiar. 
 It also includes
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/extemporelang/kiss_fft.git";)
+                    (url "https://github.com/extemporelang/kiss_fft";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -843,7 +843,7 @@ cosine/ sine transforms or DCT/DST).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vkostyukov/la4j.git";)
+                    (url "https://github.com/vkostyukov/la4j";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -965,7 +965,7 @@ algorithms from the FORTRAN library MINPACK.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/symengine/symengine.git";)
+             (url "https://github.com/symengine/symengine";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1084,7 +1084,7 @@ features, and more.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/QuantStack/xtensor.git";)
+                    (url "https://github.com/QuantStack/xtensor";)
                     (commit version)))
               (sha256
                (base32
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 9ee7d28..0fb4330 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -65,7 +65,7 @@
      (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/daym/android-make-stub.git";)
+            (url "https://github.com/daym/android-make-stub";)
             (commit (string-append "v" version))))
       (file-name (string-append "android-make-stub-"
                                 version "-checkout"))
@@ -99,7 +99,7 @@ use their packages mostly unmodified in our Android NDK build 
system.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/google/googletest.git";)
+              (url "https://github.com/google/googletest";)
               (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 0357ac1..e041592 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -201,7 +201,7 @@ contains the graphical user interface for synfig.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/LostMoho/Papagayo.git";)
+                      (url "https://github.com/LostMoho/Papagayo";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index e3f8b60..a84bf0d 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -59,7 +59,7 @@
                 (method git-fetch)
                 (file-name (git-file-name name version))
                 (uri (git-reference
-                      (url "https://github.com/letoram/arcan.git";)
+                      (url "https://github.com/letoram/arcan";)
                       (commit commit)))
                 (sha256
                  (base32 
"1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw"))))
@@ -145,7 +145,7 @@
                             (method git-fetch)
                             (file-name "arcan-openal-0.5.4")
                             (uri (git-reference
-                                  (url "https://github.com/letoram/openal.git";)
+                                  (url "https://github.com/letoram/openal";)
                                   (commit 
"1c7302c580964fee9ee9e1d89ff56d24f934bdef")))
                             (sha256
                              (base32
@@ -195,7 +195,7 @@ engine programmable using Lua.")
          (method git-fetch)
          (file-name (git-file-name name version))
          (uri (git-reference
-               (url "https://github.com/letoram/xarcan.git";)
+               (url "https://github.com/letoram/xarcan";)
                (commit commit)))
          (sha256
           (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym"))))
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 375747a..50b64a7 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -263,7 +263,7 @@ runtime")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rednex/rgbds.git";)
+                    (url "https://github.com/rednex/rgbds";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -310,7 +310,7 @@ package for the Game Boy and Game Boy Color.  It consists 
of:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vhelin/wla-dx.git";)
+                    (url "https://github.com/vhelin/wla-dx";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -380,7 +380,7 @@ as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...),
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Kingcom/armips.git";)
+             (url "https://github.com/Kingcom/armips";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b1308b1..736b934 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -400,7 +400,7 @@ engineers, musicians, soundtrack editors and composers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/audacity/audacity.git";)
+             (url "https://github.com/audacity/audacity";)
              (commit (string-append "Audacity-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -718,7 +718,7 @@ tools (analyzer, mono/stereo tools, crossovers).")
              ;; Actually https://github.com/moddevices/caps-lv2.git, but it's
              ;; missing fixes for newer glibc, so using the origin of a pull
              ;; request regarding this issue:
-             (url "https://github.com/jujudusud/caps-lv2.git";)
+             (url "https://github.com/jujudusud/caps-lv2";)
              (commit "9c9478b7fbd8f9714f552ebe2a6866398b0babfb")))
        (file-name (git-file-name name version))
        (sha256
@@ -754,7 +754,7 @@ generators of mostly elementary and occasionally exotic 
nature.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ssj71/infamousPlugins.git";)
+                    (url "https://github.com/ssj71/infamousPlugins";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -793,7 +793,7 @@ envelope follower, distortion effects, tape effects and 
more.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/swh/ladspa.git";)
+                    (url "https://github.com/swh/ladspa";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -823,7 +823,7 @@ envelope follower, distortion effects, tape effects and 
more.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/swh/lv2.git";)
+                    (url "https://github.com/swh/lv2";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -869,7 +869,7 @@ emulation (valve, tape), bit fiddling (decimator, 
pointer-cast), etc.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/csound/csound.git";)
+             (url "https://github.com/csound/csound";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1259,7 +1259,7 @@ follower.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/FluidSynth/fluidsynth.git";)
+                    (url "https://github.com/FluidSynth/fluidsynth";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1339,7 +1339,7 @@ PS, and DAB+.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/grame-cncm/faust.git";)
+                    (url "https://github.com/grame-cncm/faust";)
                     (commit (string-append "v"
                                            (string-map (lambda (c)
                                                          (if (char=? c #\.) 
#\- c))
@@ -2100,7 +2100,7 @@ software.")
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/lvtk/lvtk.git";)
+                   (url "https://github.com/lvtk/lvtk";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -2302,7 +2302,7 @@ into various outputs and to start, stop and configure 
jackd")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/orouits/qjackrcd.git";)
+                    (url "https://github.com/orouits/qjackrcd";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2337,7 +2337,7 @@ background file post-processing.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/supercollider/supercollider.git";)
+                    (url "https://github.com/supercollider/supercollider";)
                     (commit (string-append "Version-" version))
                     ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack
                     (recursive? #t)))
@@ -3084,7 +3084,7 @@ synthesizer written in C++.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Themaister/RSound.git";)
+             (url "https://github.com/Themaister/RSound";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3123,7 +3123,7 @@ with a much different focus than most other audio 
daemons.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/johnhldavis/xjackfreak.git";)
+                    (url "https://github.com/johnhldavis/xjackfreak";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3308,7 +3308,7 @@ point audio data.")
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/svend/cuetools.git";)
+                   (url "https://github.com/svend/cuetools";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -3358,7 +3358,7 @@ use them split WAVE data into multiple files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/foo86/dcadec.git";)
+                    (url "https://github.com/foo86/dcadec";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3436,7 +3436,7 @@ loudness of audio and video files to the same level.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/irungentoo/filter_audio.git";)
+               (url "https://github.com/irungentoo/filter_audio";)
                (commit commit)))
          (file-name (string-append name "-" version "-checkout"))
          (sha256
@@ -3545,7 +3545,7 @@ mixers.")
               ;; bootstrapped build system.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Arkq/bluez-alsa.git";)
+                    (url "https://github.com/Arkq/bluez-alsa";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3654,7 +3654,7 @@ the Snd sources), Ruby, or Forth.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lucianodato/noise-repellent.git";)
+                    (url "https://github.com/lucianodato/noise-repellent";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3699,7 +3699,7 @@ the following features:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dpayne/cli-visualizer.git";)
+             (url "https://github.com/dpayne/cli-visualizer";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3744,7 +3744,7 @@ representations.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/karlstav/cava.git";)
+                    (url "https://github.com/karlstav/cava";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3897,7 +3897,7 @@ library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FNA-XNA/FAudio.git";)
+             (url "https://github.com/FNA-XNA/FAudio";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4040,7 +4040,7 @@ as is the case with audio plugins.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/falkTX/Carla.git";)
+         (url "https://github.com/falkTX/Carla";)
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4291,7 +4291,7 @@ minimum.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/drowe67/codec2.git";)
+             (url "https://github.com/drowe67/codec2";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4324,7 +4324,7 @@ digital radio.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Ableton/link.git";)
+                    (url "https://github.com/Ableton/link";)
                     (commit (string-append "Link-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm
index d995ef7..b3ff912 100644
--- a/gnu/packages/authentication.scm
+++ b/gnu/packages/authentication.scm
@@ -101,7 +101,7 @@ and the time-based @dfn{TOTP} algorithm (RFC6238).")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Yubico/yubico-pam.git";)
+                      (url "https://github.com/Yubico/yubico-pam";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index f8884bb..76af6fd 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -176,7 +176,7 @@ C++.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ryansuchocki/microscheme.git";)
+             (url "https://github.com/ryansuchocki/microscheme";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"))
diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm
index 94d3d81..ba49a9d 100644
--- a/gnu/packages/axoloti.scm
+++ b/gnu/packages/axoloti.scm
@@ -71,7 +71,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/axoloti/axoloti.git";)
+             (url "https://github.com/axoloti/axoloti";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -367,7 +367,7 @@ patcher application.")))
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/axoloti/axoloti.git";)
+             (url "https://github.com/axoloti/axoloti";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -607,7 +607,7 @@ patcher application.")))
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/JohannesTaelman/elfloader.git";)
+                   (url "https://github.com/JohannesTaelman/elfloader";)
                    (commit commit)))
              (file-name (git-file-name "elfloader" commit))
              (sha256
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index dacade5..0d82a18 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -146,7 +146,7 @@ spying and/or modification by the server.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Parchive/par2cmdline.git";)
+                    (url "https://github.com/Parchive/par2cmdline";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -310,7 +310,7 @@ random access nor for in-place modification.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/miekg/rdup.git";)
+             (url "https://github.com/miekg/rdup";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -999,7 +999,7 @@ precious backup space.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/zbackup/zbackup.git";)
+             (url "https://github.com/zbackup/zbackup";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 1bc636a..47ca625 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -330,7 +330,7 @@ completion for many common commands.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/illusori/bash-tap.git";)
+             (url "https://github.com/illusori/bash-tap";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -373,7 +373,7 @@ capturing.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bats-core/bats-core.git";)
+                    (url "https://github.com/bats-core/bats-core";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 0ac1833..9b06cc4 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -131,7 +131,7 @@ is to write a job file matching the I/O load one wants to 
simulate.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/intel/mpi-benchmarks.git";)
+                    (url "https://github.com/intel/mpi-benchmarks";)
                     (commit (string-append "IMB-v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -217,7 +217,7 @@ This can give a much better understanding of the command's 
performance.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/google/benchmark.git";)
+                    (url "https://github.com/google/benchmark";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 2fe8c39..3bf3c75 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -2934,7 +2934,7 @@ qPCR data, but could be used with other types as well.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cole-trapnell-lab/monocle3.git";)
+             (url "https://github.com/cole-trapnell-lab/monocle3";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6509,7 +6509,7 @@ accessibility data.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cole-trapnell-lab/cicero-release.git";)
+               (url "https://github.com/cole-trapnell-lab/cicero-release";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6530,7 +6530,7 @@ accessibility data.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/aertslab/cisTopic.git";)
+               (url "https://github.com/aertslab/cisTopic";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 7e97cde..5683784 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -189,7 +189,7 @@ structure of the predicted RNA.")
               (method git-fetch)
               ;; BamM is not available on pypi.
               (uri (git-reference
-                    (url "https://github.com/Ecogenomics/BamM.git";)
+                    (url "https://github.com/Ecogenomics/BamM";)
                     (commit version)
                     (recursive? #t)))
               (file-name (git-file-name name version))
@@ -283,7 +283,7 @@ instance, it implements several methods to assess 
contig-wise read coverage.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pezmaster31/bamtools.git";)
+                    (url "https://github.com/pezmaster31/bamtools";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -361,7 +361,7 @@ transparently with both VCFs and BCFs, both uncompressed 
and BGZF-compressed.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bedops/bedops.git";)
+                    (url "https://github.com/bedops/bedops";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -484,7 +484,7 @@ BED, GFF/GTF, VCF.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/PacificBiosciences/pbbam.git";)
+                    (url "https://github.com/PacificBiosciences/pbbam";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -540,7 +540,7 @@ Non-PacBio BAMs will cause exceptions to be thrown.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/PacificBiosciences/blasr_libcpp.git";)
+                    (url "https://github.com/PacificBiosciences/blasr_libcpp";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -602,7 +602,7 @@ hdf and alignment.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/PacificBiosciences/blasr.git";)
+                    (url "https://github.com/PacificBiosciences/blasr";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -693,7 +693,7 @@ provides the Ribotaper pipeline.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ratschlab/RiboDiff.git";)
+             (url "https://github.com/ratschlab/RiboDiff";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -737,7 +737,7 @@ independently with transcriptional regulation.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lh3/bioawk.git";)
+                    (url "https://github.com/lh3/bioawk";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -900,7 +900,7 @@ Python.")
        ;; Use GitHub as source because PyPI distribution does not contain
        ;; test data: https://github.com/biocore/biom-format/issues/693
        (uri (git-reference
-             (url "https://github.com/biocore/biom-format.git";)
+             (url "https://github.com/biocore/biom-format";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1567,7 +1567,7 @@ errors at the end of reads.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/BenLangmead/bowtie2.git";)
+                    (url "https://github.com/BenLangmead/bowtie2";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1783,7 +1783,7 @@ and more accurate.  BWA-MEM also has better performance 
than BWA-backtrack for
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pkerpedjiev/bwa-pssm.git";)
+                    (url "https://github.com/pkerpedjiev/bwa-pssm";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1813,7 +1813,7 @@ well as many of the command line options.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brentp/bwa-meth.git";)
+                    (url "https://github.com/brentp/bwa-meth";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1887,7 +1887,7 @@ multiple sequence alignments.")
               (method git-fetch)
               ;; Test data is missing on PyPi.
               (uri (git-reference
-                    (url "https://github.com/pysam-developers/pysam.git";)
+                    (url "https://github.com/pysam-developers/pysam";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2036,7 +2036,7 @@ high-throughput sequencing data – with an emphasis on 
simplicity.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/mhammell-laboratory/tetoolkit.git";)
+                    (url "https://github.com/mhammell-laboratory/tetoolkit";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2153,7 +2153,7 @@ databases.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/YeoLab/clipper.git";)
+                    (url "https://github.com/YeoLab/clipper";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2412,7 +2412,7 @@ interval trees with associated meta-data.  It is 
primarily used by the
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/deeptools/deepTools.git";)
+                    (url "https://github.com/deeptools/deepTools";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2480,7 +2480,7 @@ other types of unwanted sequence from high-throughput 
sequencing reads.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dpryan79/libBigWig.git";)
+                    (url "https://github.com/dpryan79/libBigWig";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2560,7 +2560,7 @@ accessing bigWig files.")
        (method git-fetch)
        ;; Source from GitHub so that tests are included.
        (uri (git-reference
-             (url "https://github.com/jeetsukumaran/DendroPy.git";)
+             (url "https://github.com/jeetsukumaran/DendroPy";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2618,7 +2618,7 @@ with Python.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dellytools/delly.git";)
+                    (url "https://github.com/dellytools/delly";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2665,7 +2665,7 @@ accurately delineate genomic rearrangements throughout 
the genome.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bbuchfink/diamond.git";)
+                    (url "https://github.com/bbuchfink/diamond";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2700,7 +2700,7 @@ data and settings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/maaskola/discrover.git";)
+             (url "https://github.com/maaskola/discrover";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2773,7 +2773,7 @@ of nucleic acid binding proteins.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DReichLab/EIG.git";)
+             (url "https://github.com/DReichLab/EIG";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3021,7 +3021,7 @@ dynamic programming or a variety of heuristics.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/adarob/eXpress.git";)
+                    (url "https://github.com/adarob/eXpress";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3072,7 +3072,7 @@ ChIP-Seq, and analysis of metagenomic data.")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url 
"https://github.com/dparks1134/ExpressBetaDiversity.git";)
+                   (url "https://github.com/dparks1134/ExpressBetaDiversity";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
@@ -3199,7 +3199,7 @@ results.  The FASTX-Toolkit tools perform some of these 
preprocessing tasks.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/seqan/flexbar.git";)
+                    (url "https://github.com/seqan/flexbar";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3342,7 +3342,7 @@ genes in incomplete assemblies or complete genomes.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ctSkennerton/fxtract.git";)
+               (url "https://github.com/ctSkennerton/fxtract";)
                (commit version)))
          (file-name (git-file-name name version))
          (sha256
@@ -3378,7 +3378,7 @@ genes in incomplete assemblies or complete genomes.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ctSkennerton/util.git";)
+                   (url "https://github.com/ctSkennerton/util";)
                    (commit util-commit)))
              (file-name (string-append
                          "ctstennerton-util-" util-commit "-checkout"))
@@ -3405,7 +3405,7 @@ comment or quality sections.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/xiangzhou/GEMMA.git";)
+                    (url "https://github.com/xiangzhou/GEMMA";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3465,7 +3465,7 @@ association studies (GWAS).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/nboley/grit.git";)
+                    (url "https://github.com/nboley/grit";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3690,7 +3690,7 @@ from high-throughput sequencing assays.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/samtools/htsjdk.git";)
+                    (url "https://github.com/samtools/htsjdk";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3740,7 +3740,7 @@ manipulating HTS data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/samtools/htsjdk.git";)
+                    (url "https://github.com/samtools/htsjdk";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3784,7 +3784,7 @@ manipulating HTS data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/samtools/htsjdk.git";)
+                    (url "https://github.com/samtools/htsjdk";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3812,7 +3812,7 @@ manipulating HTS data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/broadinstitute/picard.git";)
+                    (url "https://github.com/broadinstitute/picard";)
                     (commit version)))
               (file-name (string-append "java-picard-" version "-checkout"))
               (sha256
@@ -3891,7 +3891,7 @@ VCF.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/broadinstitute/picard.git";)
+                    (url "https://github.com/broadinstitute/picard";)
                     (commit version)))
               (file-name (string-append "java-picard-" version "-checkout"))
               (sha256
@@ -3981,7 +3981,7 @@ VCF.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/broadinstitute/picard.git";)
+                    (url "https://github.com/broadinstitute/picard";)
                     (commit version)))
               (file-name (string-append "java-picard-" version "-checkout"))
               (sha256
@@ -4178,7 +4178,7 @@ The main functions of FastQC are:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/OpenGene/fastp.git";)
+             (url "https://github.com/OpenGene/fastp";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4258,7 +4258,7 @@ data.  It also provides the @command{bgzip}, 
@command{htsfile}, and
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/nboley/idr.git";)
+                    (url "https://github.com/nboley/idr";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -4349,7 +4349,7 @@ command, or queried for specific k-mers with 
@code{jellyfish query}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dib-lab/khmer.git";)
+             (url "https://github.com/dib-lab/khmer";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4457,7 +4457,7 @@ experiments.")
               ;; The PyPi tarball does not contain tests.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/taoliu/MACS.git";)
+                    (url "https://github.com/taoliu/MACS";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4580,7 +4580,7 @@ sequences).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/marbl/mash.git";)
+                    (url "https://github.com/marbl/mash";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4719,7 +4719,7 @@ probabilistic distances of genome abundance and 
tetranucleotide frequency.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ctSkennerton/minced.git";)
+                    (url "https://github.com/ctSkennerton/minced";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -4861,7 +4861,7 @@ program for nucleotide and protein sequences.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/tjunier/newick_utils.git";)
+                      (url "https://github.com/tjunier/newick_utils";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -4999,7 +4999,7 @@ the phenotype as it models the data.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/PacificBiosciences/cDNA_primer.git";)
+                      (url "https://github.com/PacificBiosciences/cDNA_primer";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -5220,7 +5220,7 @@ different command-line tools:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hyattpd/Prodigal.git";)
+                    (url "https://github.com/hyattpd/Prodigal";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5369,7 +5369,7 @@ extremely diverse sets of genomes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stamatak/standard-RAxML.git";)
+             (url "https://github.com/stamatak/standard-RAxML";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5410,7 +5410,7 @@ phylogenies.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deweylab/RSEM.git";)
+             (url "https://github.com/deweylab/RSEM";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1jlq11d1p8qp64w75yj8cnbbd1a93viq10pzsbwal7vdn8fg13j1"))
@@ -5699,7 +5699,7 @@ viewer.")
                 ;; There are no release tarballs nor tags.
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/wanpinglee/MOSAIK.git";)
+                      (url "https://github.com/wanpinglee/MOSAIK";)
                       (commit commit)))
                 (file-name (string-append name "-" version))
                 (sha256
@@ -5745,7 +5745,7 @@ Roche 454, Ion Torrent and Pacific BioSciences SMRT.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ncbi/ngs.git";)
+                    (url "https://github.com/ncbi/ngs";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -5811,7 +5811,7 @@ simultaneously.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ncbi/ncbi-vdb.git";)
+                    (url "https://github.com/ncbi/ncbi-vdb";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -5983,7 +5983,7 @@ subsequent visualization, annotation and storage of 
results.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/chrchang/plink-ng.git";)
+             (url "https://github.com/chrchang/plink-ng";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6022,7 +6022,7 @@ subsequent visualization, annotation and storage of 
results.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/smithlabcode/smithlab_cpp.git";)
+                      (url "https://github.com/smithlabcode/smithlab_cpp";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -6171,7 +6171,7 @@ sequence itself can be retrieved from these databases.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ncbi/sra-tools.git";)
+             (url "https://github.com/ncbi/sra-tools";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6381,7 +6381,7 @@ is one that takes arguments.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lh3/seqtk.git";)
+                    (url "https://github.com/lh3/seqtk";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6417,7 +6417,7 @@ optionally compressed by gzip.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/amplab/snap.git";)
+                    (url "https://github.com/amplab/snap";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6459,7 +6459,7 @@ of these reads to align data quickly through a hash-based 
indexing scheme.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/biocore/sortmerna.git";)
+             (url "https://github.com/biocore/sortmerna";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6505,7 +6505,7 @@ application of SortMeRNA is filtering rRNA from 
metatranscriptomic data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/alexdobin/STAR.git";)
+                    (url "https://github.com/alexdobin/STAR";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -6733,7 +6733,7 @@ Cuffdiff or Ballgown programs.")
               ;; The Pypi version does not include tests.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/fhcrc/taxtastic.git";)
+                    (url "https://github.com/fhcrc/taxtastic";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6858,7 +6858,7 @@ sequence.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hms-dbmi/scde.git";)
+                    (url "https://github.com/hms-dbmi/scde";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -7304,7 +7304,7 @@ annotation infrastructure.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/torognes/vsearch.git";)
+             (url "https://github.com/torognes/vsearch";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8809,7 +8809,7 @@ in SNV base substitution data.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ManuSetty/ChIPKernels.git";)
+               (url "https://github.com/ManuSetty/ChIPKernels";)
                (commit commit)))
          (file-name (string-append name "-" version))
          (sha256
@@ -8843,7 +8843,7 @@ Sequences.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ManuSetty/SeqGL.git";)
+             (url "https://github.com/ManuSetty/SeqGL";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -9019,7 +9019,7 @@ tools for sequence analysis into a seamless whole.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/arq5x/bits.git";)
+                      (url "https://github.com/arq5x/bits";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -9065,7 +9065,7 @@ intervals (e.g. genes, sequence alignments).")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/smithlabcode/piranha.git";)
+                      (url "https://github.com/smithlabcode/piranha";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -9104,7 +9104,7 @@ intervals (e.g. genes, sequence alignments).")
              (origin
                (method git-fetch)
                (uri (git-reference
-                     (url "https://github.com/smithlabcode/smithlab_cpp.git";)
+                     (url "https://github.com/smithlabcode/smithlab_cpp";)
                      (commit commit)))
                (file-name (string-append "smithlab_cpp-" commit "-checkout"))
                (sha256
@@ -9157,7 +9157,7 @@ group or two ChIP groups run under different conditions.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ekg/filevercmp.git";)
+                      (url "https://github.com/ekg/filevercmp";)
                       (commit commit)))
                 (file-name (git-file-name name commit))
                 (sha256
@@ -9234,7 +9234,7 @@ common bioinformatics tools.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vatlab/varianttools.git";)
+             (url "https://github.com/vatlab/varianttools";)
              ;; There is no tag corresponding to version 3.1.2
              (commit "813ae4a90d25b69abc8a40f4f70441fe09015249")))
        (file-name (git-file-name name version))
@@ -11134,7 +11134,7 @@ Maximum Parsimony, distance methods and Hadamard 
conjugation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rajewsky-lab/dropbead.git";)
+               (url "https://github.com/rajewsky-lab/dropbead";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11164,7 +11164,7 @@ droplet sequencing.  It has been particularly tailored 
for Drop-seq.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/lomereiter/htslib.git";)
+               (url "https://github.com/lomereiter/htslib";)
                (commit commit)))
          (file-name (string-append "htslib-" version "-checkout"))
          (sha256
@@ -11183,7 +11183,7 @@ droplet sequencing.  It has been particularly tailored 
for Drop-seq.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lomereiter/sambamba.git";)
+             (url "https://github.com/lomereiter/sambamba";)
              (commit (string-append "v" version))))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
@@ -11232,7 +11232,7 @@ droplet sequencing.  It has been particularly tailored 
for Drop-seq.")
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/biod/BioD.git";)
+                   (url "https://github.com/biod/BioD";)
                    (commit commit)))
              (file-name (string-append "biod-"
                                        (string-take commit 9)
@@ -11259,7 +11259,7 @@ sort, markdup, and depth.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/KlugerLab/Ritornello.git";)
+                    (url "https://github.com/KlugerLab/Ritornello";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -11305,7 +11305,7 @@ with narrow binding events such as transcription factor 
ChIP-seq.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FelixKrueger/TrimGalore.git";)
+             (url "https://github.com/FelixKrueger/TrimGalore";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11520,7 +11520,7 @@ applications for tackling some common problems in a 
user-friendly way.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/3DGenomes/TADbit.git";)
+                    (url "https://github.com/3DGenomes/TADbit";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -11582,7 +11582,7 @@ models.  TADbit is complemented by TADkit for 
visualizing 3D models.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ENCODE-DCC/kentUtils.git";)
+             (url "https://github.com/ENCODE-DCC/kentUtils";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11698,7 +11698,7 @@ browser.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/aboyle/F-seq.git";)
+                      (url "https://github.com/aboyle/F-seq";)
                       (commit commit)))
                 (file-name (string-append name "-" version))
                 (sha256
@@ -11756,7 +11756,7 @@ Browser.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FelixKrueger/Bismark.git";)
+             (url "https://github.com/FelixKrueger/Bismark";)
              (commit version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
@@ -11908,7 +11908,7 @@ using nucleotide or amino-acid sequence data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pachterlab/kallisto.git";)
+                    (url "https://github.com/pachterlab/kallisto";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -11957,7 +11957,7 @@ accurate as existing quantification tools.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Kingsford-Group/libgff.git";)
+                    (url "https://github.com/Kingsford-Group/libgff";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -11980,7 +11980,7 @@ dependency like SeqAn.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kingsfordgroup/sailfish.git";)
+                    (url "https://github.com/kingsfordgroup/sailfish";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -12095,7 +12095,7 @@ dependency like SeqAn.")
        ("rapmap" ,(origin
                     (method git-fetch)
                     (uri (git-reference
-                          (url "https://github.com/COMBINE-lab/RapMap.git";)
+                          (url "https://github.com/COMBINE-lab/RapMap";)
                           (commit (string-append "sf-v" version))))
                     (file-name (string-append "rapmap-sf-v" version 
"-checkout"))
                     (sha256
@@ -12130,7 +12130,7 @@ file(s) containing your reads.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/COMBINE-lab/staden-io_lib.git";)
+                    (url "https://github.com/COMBINE-lab/staden-io_lib";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -12171,7 +12171,7 @@ The following file formats are supported:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/COMBINE-lab/salmon.git";)
+                    (url "https://github.com/COMBINE-lab/salmon";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -12284,7 +12284,7 @@ The following file formats are supported:
        ("rapmap" ,(origin
                     (method git-fetch)
                     (uri (git-reference
-                          (url "https://github.com/COMBINE-lab/RapMap.git";)
+                          (url "https://github.com/COMBINE-lab/RapMap";)
                           (commit (string-append "salmon-v" version))))
                     (file-name (string-append "rapmap-salmon-v" version 
"-checkout"))
                     (sha256
@@ -12317,7 +12317,7 @@ variational inference.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/linnarsson-lab/loompy.git";)
+                    (url "https://github.com/linnarsson-lab/loompy";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -12360,7 +12360,7 @@ single-cell RNA-seq data.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/cmzmasek/forester.git";)
+                      (url "https://github.com/cmzmasek/forester";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -13200,7 +13200,7 @@ HTML reports with interesting findings about your 
samples.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jsh58/Genrich.git";)
+                    (url "https://github.com/jsh58/Genrich";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -13235,7 +13235,7 @@ enrichment.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/splatlab/mantis.git";)
+                      (url "https://github.com/splatlab/mantis";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -13302,7 +13302,7 @@ rate speciation and extinction.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/pervouchine/sjcount-full.git";)
+                      (url "https://github.com/pervouchine/sjcount-full";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -13447,7 +13447,7 @@ Thus the per-base error rate is similar to the raw 
input reads.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/BIMSBbioinfo/ciRcus.git";)
+             (url "https://github.com/BIMSBbioinfo/ciRcus";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -13493,7 +13493,7 @@ can be calculated, and a number of descriptive plots 
easily generated.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gpertea/gffread.git";)
+               (url "https://github.com/gpertea/gffread";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13527,7 +13527,7 @@ can be calculated, and a number of descriptive plots 
easily generated.")
              (origin
                (method git-fetch)
                (uri (git-reference
-                     (url "https://github.com/gpertea/gclib.git";)
+                     (url "https://github.com/gpertea/gclib";)
                      (commit commit)))
                (file-name (git-file-name "gclib" version))
                (sha256
@@ -13554,7 +13554,7 @@ conversions, region filtering, FASTA sequence 
extraction and more.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/marvin-jens/find_circ.git";)
+               (url "https://github.com/marvin-jens/find_circ";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13834,7 +13834,7 @@ bound.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/4dn-dcic/pairix.git";)
+             (url "https://github.com/4dn-dcic/pairix";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13933,7 +13933,7 @@ such as Hi-C contact matrices.")
        ;; Version 12 is not available on pypi.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deeptools/HiCMatrix.git";)
+             (url "https://github.com/deeptools/HiCMatrix";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13973,7 +13973,7 @@ the HiCExplorer and pyGenomeTracks packages.")
        ;; The latest version is not available on Pypi.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deeptools/HiCExplorer.git";)
+             (url "https://github.com/deeptools/HiCExplorer";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14122,7 +14122,7 @@ sequencing data.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/renozao/xbioc.git";)
+                      (url "https://github.com/renozao/xbioc";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -14155,7 +14155,7 @@ provided by Bioconductor packages.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/shenorrLab/csSAM.git";)
+                      (url "https://github.com/shenorrLab/csSAM";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -14186,7 +14186,7 @@ SAM.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/shenorrLab/bseqsc.git";)
+                      (url "https://github.com/shenorrLab/bseqsc";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -14234,7 +14234,7 @@ and intra-cell population structure.\" Baron et al. 
Cell Systems (2016)
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rrwick/Porechop.git";)
+               (url "https://github.com/rrwick/Porechop";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14265,7 +14265,7 @@ Barcoding Kit or Rapid Barcoding Kit.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/arq5x/poretools.git";)
+               (url "https://github.com/arq5x/poretools";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14326,7 +14326,7 @@ absolute GSEA.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mahmoudibrahim/JAMM.git";)
+             (url "https://github.com/mahmoudibrahim/JAMM";)
              (commit (string-append "JAMMv" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14526,7 +14526,7 @@ datasets.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rrwick/Filtlong.git";)
+               (url "https://github.com/rrwick/Filtlong";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14587,7 +14587,7 @@ choosing which reads pass the filter.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jts/nanopolish.git";)
+               (url "https://github.com/jts/nanopolish";)
                (commit commit)
                (recursive? #t)))
          (file-name (git-file-name name version))
@@ -14661,7 +14661,7 @@ polymorphisms) and indels with respect to a reference 
genome and more.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/etal/cnvkit.git";)
+             (url "https://github.com/etal/cnvkit";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14697,7 +14697,7 @@ Torrent.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/KlugerLab/pyFIt-SNE.git";)
+             (url "https://github.com/KlugerLab/pyFIt-SNE";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14960,7 +14960,7 @@ tools which build on STAR, Arriba does not require to 
reduce the
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/MikkelSchubert/adapterremoval.git";)
+             (url "https://github.com/MikkelSchubert/adapterremoval";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14999,7 +14999,7 @@ sequence for paired-ended data, for which this 
information is not available.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/matsen/pplacer.git";)
+               (url "https://github.com/matsen/pplacer";)
                (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
@@ -15221,7 +15221,7 @@ on the needs of the user.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ParkerLab/ataqv.git";)
+             (url "https://github.com/ParkerLab/ataqv";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15262,7 +15262,7 @@ might be caused by ATAC-seq library prep or sequencing. 
 The main program,
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kcha/psiplot.git";)
+             (url "https://github.com/kcha/psiplot";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15293,7 +15293,7 @@ are generated using @code{ggplot2}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nanoporetech/ont_fast5_api.git";)
+             (url "https://github.com/nanoporetech/ont_fast5_api";)
              (commit (string-append "release_" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15324,7 +15324,7 @@ and reflect the fast5 file schema, and tools to convert 
between
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/phoenixding/tbsp.git";)
+               (url "https://github.com/phoenixding/tbsp";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15636,7 +15636,7 @@ manipulations on VCF files.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ekg/freebayes.git";)
+                      (url "https://github.com/ekg/freebayes";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15754,7 +15754,7 @@ length of a short-read sequencing alignment.")
     (source (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/GregoryFaust/samblaster.git";)
+            (url "https://github.com/GregoryFaust/samblaster";)
             (commit (string-append "v." version))))
       (file-name (git-file-name name version))
       (sha256
@@ -15791,7 +15791,7 @@ pairs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/velocyto-team/velocyto.R.git";)
+               (url "https://github.com/velocyto-team/velocyto.R";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15832,7 +15832,7 @@ patterns.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dpryan79/MethylDackel.git";)
+                    (url "https://github.com/dpryan79/MethylDackel";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -15880,7 +15880,7 @@ containing the reference genome as well.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/daler/gffutils.git";)
+               (url "https://github.com/daler/gffutils";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 3314a6a..edae9be 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -192,7 +192,7 @@ XML-RPC over SCGI.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tremc/tremc.git";)
+               (url "https://github.com/tremc/tremc";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -223,7 +223,7 @@ Transmission BitTorrent daemon.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/fagga/transmission-remote-cli.git";)
+                    (url "https://github.com/fagga/transmission-remote-cli";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -347,7 +347,7 @@ downloads, download scheduling, download rate limiting.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Rudde/mktorrent.git";)
+                    (url "https://github.com/Rudde/mktorrent";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -421,7 +421,7 @@ desktops.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/qbittorrent/qBittorrent.git";)
+             (url "https://github.com/qbittorrent/qBittorrent";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 9e7c40c..6a08b0d 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -288,7 +288,7 @@ across a broad spectrum of applications.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/boostorg/sync.git";)
+                      (url "https://github.com/boostorg/sync";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -317,7 +317,7 @@ Boost.Thread.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/boostorg/signals2.git";)
+                    (url "https://github.com/boostorg/signals2";)
                     (commit (string-append "boost-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index bb00cf4..7213c1b 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -59,7 +59,7 @@
               ;; do not use auto-generated tarballs
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/matricks/bam.git";)
+                    (url "https://github.com/matricks/bam";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 8590b13..25bc78e 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -351,7 +351,7 @@ releases.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rsyslog/libestr.git";)
+             (url "https://github.com/rsyslog/libestr";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -384,7 +384,7 @@ more, like escaping special characters.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rsyslog/libfastjson.git";)
+             (url "https://github.com/rsyslog/libfastjson";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -411,7 +411,7 @@ with essential JSON handling functions, sufficiently good 
JSON support (not
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rsyslog/liblogging.git";)
+             (url "https://github.com/rsyslog/liblogging";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 71b4827..726687d 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -63,7 +63,7 @@
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/HowardHinnant/date.git";)
+               (url "https://github.com/HowardHinnant/date";)
                (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index ac8dd26..6dee19f 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -253,7 +253,7 @@ reconstruction capability.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cdrdao/cdrdao.git";)
+             (url "https://github.com/cdrdao/cdrdao";)
              (commit
               (string-append "rel_" (string-replace-substring version "." 
"_")))))
        (file-name (git-file-name name version))
@@ -555,7 +555,7 @@ graphical interface.")
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/lipnitsk/libcue.git";)
+                   (url "https://github.com/lipnitsk/libcue";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3b946d7..8dd4b36 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -470,7 +470,7 @@ has been designed to be fast, light and unintrusive.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/go-check/check.git";)
+                      (url "https://github.com/go-check/check";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -576,7 +576,7 @@ test coverage and has a web user interface that will 
refresh automatically.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/google/googletest.git";)
+             (url "https://github.com/google/googletest";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -600,7 +600,7 @@ generation.")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/google/googletest.git";)
+                   (url "https://github.com/google/googletest";)
                    (commit (string-append "release-" version))))
              (file-name (git-file-name "googletest" version))
              (sha256
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 0540dfc..ddbf5ca 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -57,7 +57,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cryos/avogadro.git";)
+             (url "https://github.com/cryos/avogadro";)
              (commit version)))
        (sha256
         (base32 "0258py3lkba85qhs5ynancinyym61vlp0zaq9yrfs3hhnhpzv9n2"))
@@ -313,7 +313,7 @@ NumPy < 1.9.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/gromacs/tng.git";)
+                    (url "https://github.com/gromacs/tng";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index d08363a..b80421d 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -46,7 +46,7 @@
     (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/nanopass/nanopass-framework-scheme.git";)
+            (url "https://github.com/nanopass/nanopass-framework-scheme";)
             (commit (string-append "v" version))))
       (sha256 (base32 "0lrngdna6w7v9vlp1a873hgwrwsz2p0pgkccswa4smzvdyhgfsri"))
       (file-name (git-file-name "nanopass" version)))))
@@ -56,7 +56,7 @@
     (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/dybvig/stex.git";)
+            (url "https://github.com/dybvig/stex";)
             (commit (string-append "v" version))))
       (sha256 (base32 "1jiawhhqnsj42hzmlbq5xby3iarhf8vhiqs0kg1a0zg5jsn6cf8n"))
       (file-name (git-file-name "stex" version)))))
@@ -69,7 +69,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cisco/ChezScheme.git";)
+             (url "https://github.com/cisco/ChezScheme";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1hagrqdp649n2g0wq2a9gfnz7mjcjakkw7ziplbj3db412bb7kx5"))
@@ -230,7 +230,7 @@ and 32-bit PowerPC architectures.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fedeinthemix/chez-srfi.git";)
+             (url "https://github.com/fedeinthemix/chez-srfi";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1vgn984mj2q4w6r2q66h7qklp2hrh85wwh4k9yisga5fi0ps7myf"))
@@ -261,7 +261,7 @@ and 32-bit PowerPC architectures.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/arcfide/ChezWEB.git";)
+               (url "https://github.com/arcfide/ChezWEB";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -326,7 +326,7 @@ programming in Scheme.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/arcfide/chez-sockets.git";)
+               (url "https://github.com/arcfide/chez-sockets";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -456,7 +456,7 @@ Chez Scheme.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fedeinthemix/chez-irregex.git";)
+             (url "https://github.com/fedeinthemix/chez-irregex";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "0jh6piylw545j81llay9wfivgpv6lcnwd81gm4w17lkasslir50q"))
diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 9a1ceed..e66132a 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -151,7 +151,7 @@ designs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure/algo.generic.git";)
+             (url "https://github.com/clojure/algo.generic";)
              (commit (string-append "algo.generic-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -176,7 +176,7 @@ that can be implemented for any data type.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure/algo.monads.git";)
+             (url "https://github.com/clojure/algo.monads";)
              (commit (string-append "algo.monads-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -205,7 +205,7 @@ defining and using monads and useful monadic functions.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/clojure/core.match.git";)
+                      (url "https://github.com/clojure/core.match";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -232,7 +232,7 @@ It supports Clojure 1.5.1 and later as well as 
ClojureScript.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Engelberg/instaparse.git";)
+                      (url "https://github.com/Engelberg/instaparse";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -283,7 +283,7 @@ tree.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure/tools.macro.git";)
+             (url "https://github.com/clojure/tools.macro";)
              (commit (string-append "tools.macro-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 7a1dfa5..6229a04 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -238,7 +238,7 @@ COCOMO model or user-provided parameters.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/AlDanial/cloc.git";)
+             (url "https://github.com/AlDanial/cloc";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -422,7 +422,7 @@ expressions, and its ability to generate emacs-style TAGS 
files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cameronwhite/withershins.git";)
+             (url "https://github.com/cameronwhite/withershins";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -482,7 +482,7 @@ stack traces.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/linux-test-project/lcov.git";)
+                      (url "https://github.com/linux-test-project/lcov";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -574,7 +574,7 @@ possible to collect coverage information without special 
compiler switches.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Andersbakken/rtags.git";)
+             (url "https://github.com/Andersbakken/rtags";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (patches (search-patches "rtags-separate-rct.patch"))
@@ -626,7 +626,7 @@ importantly we give you proper follow-symbol and 
find-references support.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pagekite/Colormake.git";)
+             (url "https://github.com/pagekite/Colormake";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -676,7 +676,7 @@ produce colored output.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lindenb/makefile2graph.git";)
+             (url "https://github.com/lindenb/makefile2graph";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 730d6a5..fd5483b 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -679,7 +679,7 @@ This package is mostly for compatibility and historical 
interest.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/raboof/sfArkLib.git";)
+                     (url "https://github.com/raboof/sfArkLib";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -715,7 +715,7 @@ with the sfArk algorithm.")
                 ;; commit at this time.
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/raboof/sfarkxtc.git";)
+                      (url "https://github.com/raboof/sfarkxtc";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1004,7 +1004,7 @@ smaller than those produced by @code{Xdelta}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jmacd/xdelta.git";)
+             (url "https://github.com/jmacd/xdelta";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1078,7 +1078,7 @@ well as bzip2.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/google/snappy.git";)
+              (url "https://github.com/google/snappy";)
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1816,7 +1816,7 @@ non-Windows systems without running the actual installer 
using wine.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/google/brotli.git";)
+             (url "https://github.com/google/brotli";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1947,7 +1947,7 @@ download times, and other distribution and storage 
costs.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/stachenov/quazip.git";)
+                    (url "https://github.com/stachenov/quazip";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2112,7 +2112,7 @@ file compression algorithm.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ib/xarchiver.git";)
+             (url "https://github.com/ib/xarchiver";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2142,7 +2142,7 @@ archiver is not installed.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/AQUAOSOTech/tarsplitter.git";)
+                    (url "https://github.com/AQUAOSOTech/tarsplitter";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2176,7 +2176,7 @@ chunks.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Blosc/c-blosc.git";)
+                    (url "https://github.com/Blosc/c-blosc";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm
index 9183348..940fc83 100644
--- a/gnu/packages/compton.scm
+++ b/gnu/packages/compton.scm
@@ -50,7 +50,7 @@
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/chjj/compton.git";)
+               (url "https://github.com/chjj/compton";)
                (commit (string-append "v" upstream-version))))
          (sha256
           (base32
@@ -119,7 +119,7 @@ performance).
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/yshui/picom.git";)
+             (url "https://github.com/yshui/picom";)
              (commit (string-append "v" version))))
        (sha256
         (base32
diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm
index 1324357..166e66c 100644
--- a/gnu/packages/coq.scm
+++ b/gnu/packages/coq.scm
@@ -51,7 +51,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/coq/coq.git";)
+             (url "https://github.com/coq/coq";)
              (commit (string-append "V" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -329,7 +329,7 @@ assistant.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/math-comp/math-comp.git";)
+             (url "https://github.com/math-comp/math-comp";)
              (commit (string-append "mathcomp-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -423,7 +423,7 @@ theorems between the two libraries.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/coq/bignums.git";)
+                     (url "https://github.com/coq/bignums";)
                      (commit (string-append "V" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -552,7 +552,7 @@ uses Ltac to synthesize the substitution operation.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mattam82/Coq-Equations.git";)
+                    (url "https://github.com/mattam82/Coq-Equations";)
                     (commit (string-append "v" version "-8.10"))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 6b29dfc..cfbd116 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -122,7 +122,7 @@ operating system functions.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/aseba-community/dashel.git";)
+             (url "https://github.com/aseba-community/dashel";)
              (commit version)))
        (sha256
         (base32 "0anks2l2i2qp0wlzqck1qgpq15a3l6dg8lw2h8s4nsj7f61lffwy"))
@@ -147,7 +147,7 @@ combination of these streams.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/QuantStack/xsimd.git";)
+             (url "https://github.com/QuantStack/xsimd";)
              (commit version)))
        (sha256
         (base32 "1ny2qin1j4h35mljivh8z52kwdyjxf4yxlzb8j52ji91v2ccc88j"))
@@ -268,7 +268,7 @@ intuitive syntax and trivial integration.")
               (method git-fetch)
               (uri
                (git-reference
-                (url "https://github.com/QuantStack/xtl.git";)
+                (url "https://github.com/QuantStack/xtl";)
                 (commit version)))
               (sha256
                (base32
@@ -404,7 +404,7 @@ and make @code{cpplint} usable in wider contexts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Stiffstream/sobjectizer.git";)
+             (url "https://github.com/Stiffstream/sobjectizer";)
              (commit (string-append "v." version))))
        (sha256
         (base32 "0jfai7sqxnnjkms38krm7mssj5l79nb3pllkbyj4j581a7l5j6l5"))
@@ -435,7 +435,7 @@ development of concurrent and multithreaded applications in 
C++.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mobius3/tweeny.git";)
+             (url "https://github.com/mobius3/tweeny";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -462,7 +462,7 @@ point and then, after each tween step, plugging back the 
result.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/abseil/abseil-cpp.git";)
+                    (url "https://github.com/abseil/abseil-cpp";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -506,7 +506,7 @@ Google's C++ code base.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/taocpp/PEGTL.git";)
+                    (url "https://github.com/taocpp/PEGTL";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 160e775..e565438 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1063,7 +1063,7 @@ data structures in C++.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rstudio/shiny.git";)
+             (url "https://github.com/rstudio/shiny";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1437,7 +1437,7 @@ R objects into the JSON format that the d3.js library 
expects.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/fbreitwieser/sankeyD3.git";)
+               (url "https://github.com/fbreitwieser/sankeyD3";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16234,7 +16234,7 @@ multiple plots.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/MacoskoLab/liger.git";)
+             (url "https://github.com/MacoskoLab/liger";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 0101893..5532f7e 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -513,7 +513,7 @@ attacks than alternative functions such as @code{PBKDF2} or 
@code{bcrypt}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/technion/libscrypt.git";)
+             (url "https://github.com/technion/libscrypt";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -907,7 +907,7 @@ security.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/vstakhov/asignify.git";)
+                       (url "https://github.com/vstakhov/asignify";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index b0bdd6d..55b7e43 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -295,7 +295,7 @@ FTP servers.  It is based on the curl library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jpbarrette/curlpp.git";)
+             (url "https://github.com/jpbarrette/curlpp";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1b0ylnnrhdax4kwjq64r1fk0i24n5ss6zfzf4hxwgslny01xiwrk"))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9befa64..55fc4f8 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -148,7 +148,7 @@
     (source (origin
       (method git-fetch)
       (uri (git-reference
-             (url "https://github.com/4store/4store.git";)
+             (url "https://github.com/4store/4store";)
              (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -1433,7 +1433,7 @@ which uses SQL to describe changes.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/coffeeandscripts/sqlcrush.git";)
+                      (url "https://github.com/coffeeandscripts/sqlcrush";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -2192,7 +2192,7 @@ virtual address space — not physical RAM.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/drycpp/lmdbxx.git";)
+             (url "https://github.com/drycpp/lmdbxx";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2421,7 +2421,7 @@ for ODBC.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/brianb/mdbtools.git";)
+             (url "https://github.com/brianb/mdbtools";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3157,7 +3157,7 @@ transforms idiomatic python function calls to well-formed 
SQL queries.")
     (source
      (origin (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/kayak/pypika.git";)
+                   (url "https://github.com/kayak/pypika";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 864f184..b996a53 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -86,7 +86,7 @@ library.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/sparsehash/sparsehash.git";)
+                     (url "https://github.com/sparsehash/sparsehash";)
                      (commit (string-append name "-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -161,7 +161,7 @@ queues, stacks, and doubly-linked lists.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/troydhanson/uthash.git";)
+             (url "https://github.com/troydhanson/uthash";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -263,7 +263,7 @@ equivalent succinct data structure are (most of the time) 
identical.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/y-256/libdivsufsort.git";)
+                    (url "https://github.com/y-256/libdivsufsort";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index cceebb0..f3e01de 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -402,7 +402,7 @@ server and embedded PowerPC, and S390 guests.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/lanl/stress-make.git";)
+               (url "https://github.com/lanl/stress-make";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -606,7 +606,7 @@ fun.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dlbeer/mspdebug.git";)
+                    (url "https://github.com/dlbeer/mspdebug";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 7b94a95..a5278d8 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -96,7 +96,7 @@
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/IgnorantGuru/udevil.git";)
+         (url "https://github.com/IgnorantGuru/udevil";)
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -486,7 +486,7 @@ systems.  Output format is completely customizable.")
      (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/AltraMayor/f3.git";)
+            (url "https://github.com/AltraMayor/f3";)
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -524,7 +524,7 @@ a card with a smaller capacity than stated.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dcantrell/pyparted.git";)
+             (url "https://github.com/dcantrell/pyparted";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -565,7 +565,7 @@ a card with a smaller capacity than stated.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/markfasheh/duperemove.git";)
+             (url "https://github.com/markfasheh/duperemove";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1scz76pvpljvrpfn176125xwaqwyy4pirlm11sc9spb2hyzknw2z"))
@@ -695,7 +695,7 @@ passphrases.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pmem/ndctl.git";)
+                    (url "https://github.com/pmem/ndctl";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -918,7 +918,7 @@ on your file system and offers to remove it.  
@command{rmlint} can find:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/gokcehan/lf.git";)
+                    (url "https://github.com/gokcehan/lf";)
                     (commit (string-append "r" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm
index d861484..0e5fe5e 100644
--- a/gnu/packages/distributed.scm
+++ b/gnu/packages/distributed.scm
@@ -48,7 +48,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/boinc/boinc.git";)
+                    (url "https://github.com/boinc/boinc";)
                     (commit (string-append "client_release/"
                                            (version-major+minor version)
                                            "/" version))))
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 0cf414a..f723fca 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -132,7 +132,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
        (method git-fetch)
        ;; Fetch from the git repository, so that the tests can be run.
        (uri (git-reference
-             (url "https://github.com/django-extensions/django-extensions.git";)
+             (url "https://github.com/django-extensions/django-extensions";)
              (commit version)))
        (file-name (string-append name "-" version))
        (sha256
@@ -375,7 +375,7 @@ account authentication.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jazzband/django-debug-toolbar.git";)
+             (url "https://github.com/jazzband/django-debug-toolbar";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -483,7 +483,7 @@ merging, minifying and compiling CSS and Javascript files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/niwinz/django-jinja.git";)
+             (url "https://github.com/niwinz/django-jinja";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm
index 5db012c..6cdb2ef 100644
--- a/gnu/packages/dlang.scm
+++ b/gnu/packages/dlang.scm
@@ -88,7 +88,7 @@ and freshness without requiring additional information from 
the user.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ldc-developers/ldc.git";)
+               (url "https://github.com/ldc-developers/ldc";)
                (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
@@ -156,7 +156,7 @@ and freshness without requiring additional information from 
the user.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/phobos.git";)
+                   (url "https://github.com/ldc-developers/phobos";)
                    (commit (string-append "ldc-v" version))))
              (file-name (git-file-name "phobos" version))
              (sha256
@@ -166,7 +166,7 @@ and freshness without requiring additional information from 
the user.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/druntime.git";)
+                   (url "https://github.com/ldc-developers/druntime";)
                    (commit (string-append "ldc-v" version))))
              (file-name (git-file-name "druntime" version))
              (sha256
@@ -175,7 +175,7 @@ and freshness without requiring additional information from 
the user.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/dmd-testsuite.git";)
+                   (url "https://github.com/ldc-developers/dmd-testsuite";)
                    (commit (string-append "ldc-v" version))))
              (file-name (git-file-name "dmd-testsuite" version))
              (sha256
@@ -206,7 +206,7 @@ bootstrapping more recent compilers written in D.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ldc-developers/ldc.git";)
+               (url "https://github.com/ldc-developers/ldc";)
                (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
@@ -273,7 +273,7 @@ bootstrapping more recent compilers written in D.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/phobos.git";)
+                   (url "https://github.com/ldc-developers/phobos";)
                    (commit (string-append "ldc-v" older-version))))
              (file-name (git-file-name "phobos" older-version))
              (sha256
@@ -292,7 +292,7 @@ bootstrapping more recent compilers written in D.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/druntime.git";)
+                   (url "https://github.com/ldc-developers/druntime";)
                    (commit (string-append "ldc-v" older-version))))
              (file-name (git-file-name "druntime" older-version))
              (sha256
@@ -301,7 +301,7 @@ bootstrapping more recent compilers written in D.")
           ,(origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/ldc-developers/dmd-testsuite.git";)
+                   (url "https://github.com/ldc-developers/dmd-testsuite";)
                    (commit (string-append "ldc-v" older-version))))
              (file-name (git-file-name "dmd-testsuite" older-version))
              (sha256
@@ -315,7 +315,7 @@ bootstrapping more recent compilers written in D.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dlang/dub.git";)
+             (url "https://github.com/dlang/dub";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index cb85074..1d893e4 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -762,7 +762,7 @@ LuaJIT, both a resolver library and a daemon.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ddclient/ddclient.git";)
+             (url "https://github.com/ddclient/ddclient";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -929,7 +929,7 @@ local networks.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/publicsuffix/list.git";)
+                      (url "https://github.com/publicsuffix/list";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 8c6a14e..a558953 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -179,7 +179,7 @@ Python without keeping their credentials in a Docker 
configuration file.")
      (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/containerd/containerd.git";)
+            (url "https://github.com/containerd/containerd";)
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -257,7 +257,7 @@ network attachments.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/docker/libnetwork.git";)
+                      (url "https://github.com/docker/libnetwork";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -311,7 +311,7 @@ built-in registry server of Docker.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/docker/engine.git";)
+             (url "https://github.com/docker/engine";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -601,7 +601,7 @@ provisioning etc.")
      (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/docker/cli.git";)
+            (url "https://github.com/docker/cli";)
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -671,7 +671,7 @@ provisioning etc.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/savoirfairelinux/cqfd.git";)
+                    (url "https://github.com/savoirfairelinux/cqfd";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -709,7 +709,7 @@ defined in a per-project configuration file.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/krallin/tini.git";)
+                    (url "https://github.com/krallin/tini";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 47d3145..99e7b66 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -279,7 +279,7 @@ easy.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jmoenig/Snap.git";)
+             (url "https://github.com/jmoenig/Snap";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm
index bc27a7a..12cadd6 100644
--- a/gnu/packages/efi.scm
+++ b/gnu/packages/efi.scm
@@ -187,7 +187,7 @@ and EFI variable management.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mfleming/efilinux.git";)
+                    (url "https://github.com/mfleming/efilinux";)
                     (commit (string-append "efilinux-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm
index b034400..8a2b6b3 100644
--- a/gnu/packages/elixir.scm
+++ b/gnu/packages/elixir.scm
@@ -38,7 +38,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/elixir-lang/elixir.git";)
+             (url "https://github.com/elixir-lang/elixir";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index f90f2c4..9e053da 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -239,7 +239,7 @@ metadata.")
       (source
        (origin
          (uri (git-reference
-               (url "https://github.com/xiaohanyu/ac-geiser.git";)
+               (url "https://github.com/xiaohanyu/ac-geiser";)
                (commit commit)))
          (method git-fetch)
          (sha256
@@ -383,7 +383,7 @@ configuration files, such as .gitattributes, .gitignore, 
and .git/config.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magit/with-editor.git";)
+             (url "https://github.com/magit/with-editor";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -409,7 +409,7 @@ on stdout instead of using a socket as the Emacsclient 
does.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/magit/libegit2.git";)
+                      (url "https://github.com/magit/libegit2";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -487,7 +487,7 @@ libgit2 bindings for Emacs, intended to boost the 
performance of Magit.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/magit/magit.git";)
+               (url "https://github.com/magit/magit";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -598,7 +598,7 @@ support for Git-SVN.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magit/magit-popup.git";)
+             (url "https://github.com/magit/magit-popup";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -632,7 +632,7 @@ process, passing on the arguments as command line 
arguments.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/magit/magit-annex.git";)
+                      (url "https://github.com/magit/magit-annex";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -655,7 +655,7 @@ process, passing on the arguments as command line 
arguments.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/tarsius/minions.git";)
+                    (url "https://github.com/tarsius/minions";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -687,7 +687,7 @@ Alternatively the menu can be bound globally, for example:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/volrath/treepy.el.git";)
+                    (url "https://github.com/volrath/treepy.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -715,7 +715,7 @@ clojure.walk and clojure.zip respectively.")
                        #t))
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vermiculus/graphql.el.git";)
+                    (url "https://github.com/vermiculus/graphql.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -778,7 +778,7 @@ handful of functions that are not resource-specific.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mrkkrp/typit.git";)
+               (url "https://github.com/mrkkrp/typit";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -815,7 +815,7 @@ until time is up.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/emacs-pe/scribble-mode.git";)
+                      (url "https://github.com/emacs-pe/scribble-mode";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1078,7 +1078,7 @@ provides an optional IDE-like error list.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/federicotdn/flymake-shellcheck.git";)
+               (url "https://github.com/federicotdn/flymake-shellcheck";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1099,7 +1099,7 @@ scripts.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/plexus/a.el.git";)
+                    (url "https://github.com/plexus/a.el";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1146,7 +1146,7 @@ directly.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rolandwalker/anaphora.git";)
+             (url "https://github.com/rolandwalker/anaphora";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1252,7 +1252,7 @@ terminals.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/purcell/reformatter.el.git";)
+             (url "https://github.com/purcell/reformatter.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1299,7 +1299,7 @@ regexp-like arguments to @code{skip-chars-forward} and
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Malabarba/elisp-bug-hunter.git";)
+               (url "https://github.com/Malabarba/elisp-bug-hunter";)
                (commit commit)))
          (file-name (git-file-name name commit))
          (sha256
@@ -1461,7 +1461,7 @@ or unexpected behavior inside an elisp configuration file 
(typically
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/m00natic/eww-lnum.git";)
+                    (url "https://github.com/m00natic/eww-lnum";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1599,7 +1599,7 @@ within a specified width.  It is useful for displaying 
long track titles.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/abo-abo/ace-link.git";)
+             (url "https://github.com/abo-abo/ace-link";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1627,7 +1627,7 @@ letter to each link using avy.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ncaq/auto-sudoedit.git";)
+             (url "https://github.com/ncaq/auto-sudoedit";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1721,7 +1721,7 @@ than @code{electric-indent-mode}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/raxod502/ctrlf.git";)
+             (url "https://github.com/raxod502/ctrlf";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1805,7 +1805,7 @@ links.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Wilfred/ag.el.git";)
+                    (url "https://github.com/Wilfred/ag.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1916,7 +1916,7 @@ or XEmacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sebastiansturm/autothemer.git";)
+             (url "https://github.com/sebastiansturm/autothemer";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1976,7 +1976,7 @@ searches.  Unlike code@{emacs-wiki.el}, it can be 
combined with any format.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joodland/bm.git";)
+             (url "https://github.com/joodland/bm";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1996,7 +1996,7 @@ the ability to jump forward and backward to the next 
bookmark.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kiwanami/emacs-calfw.git";)
+             (url "https://github.com/kiwanami/emacs-calfw";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2072,7 +2072,7 @@ Its features are:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wbolster/emacs-direnv.git";)
+             (url "https://github.com/wbolster/emacs-direnv";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2124,7 +2124,7 @@ that the binary uses instead of the actual binary 
contents.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wasamasa/form-feed.git";)
+             (url "https://github.com/wasamasa/form-feed";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2203,7 +2203,7 @@ current match, total matches and exit status.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dominikh/go-mode.el.git";)
+                    (url "https://github.com/dominikh/go-mode.el";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2231,7 +2231,7 @@ written in the Go programming language.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jd/google-maps.el.git";)
+                    (url "https://github.com/jd/google-maps.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2252,7 +2252,7 @@ Maps directly inside Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ppareit/graphviz-dot-mode.git";)
+             (url "https://github.com/ppareit/graphviz-dot-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2343,7 +2343,7 @@ a single buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mrkkrp/mmt.git";)
+             (url "https://github.com/mrkkrp/mmt";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2362,7 +2362,7 @@ Lisp developers who want to write macros with 
convenience.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/politza/tablist.git";)
+                    (url "https://github.com/politza/tablist";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2503,7 +2503,7 @@ and stored in memory.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/magnars/dash.el.git";)
+                    (url "https://github.com/magnars/dash.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2618,7 +2618,7 @@ evaluations.  The entry point is @code{M-x build-farm} 
command.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url 
"https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode.git";)
+             (url "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2644,7 +2644,7 @@ work with Emacs 24 and 25.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url 
"https://github.com/extemporelang/extempore-emacs-mode.git";)
+               (url "https://github.com/extemporelang/extempore-emacs-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2670,7 +2670,7 @@ running Extempore process, and more.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jmorag/kakoune.el.git";)
+               (url "https://github.com/jmorag/kakoune.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2715,7 +2715,7 @@ a command.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rnkn/olivetti.git";)
+                    (url "https://github.com/rnkn/olivetti";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2756,7 +2756,7 @@ allows easily move between them.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magnars/s.el.git";)
+             (url "https://github.com/magnars/s.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2780,7 +2780,7 @@ strings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/zk-phi/symon.git";)
+             (url "https://github.com/zk-phi/symon";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2829,7 +2829,7 @@ Stack Overflow, Super User, and other StackExchange 
sites.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dryman/toml-mode.el.git";)
+               (url "https://github.com/dryman/toml-mode.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2873,7 +2873,7 @@ Emacs.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rejeep/f.el.git";)
+                    (url "https://github.com/rejeep/f.el";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2919,7 +2919,7 @@ using the Fountain plain text markup format.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nschum/fringe-helper.el.git";)
+               (url "https://github.com/nschum/fringe-helper.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2945,7 +2945,7 @@ representation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-git-gutter.git";)
+             (url "https://github.com/syohex/emacs-git-gutter";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2973,7 +2973,7 @@ display and behaviour is easily customisable.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/syohex/git-gutter-fringe.git";)
+               (url "https://github.com/syohex/git-gutter-fringe";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2997,7 +2997,7 @@ window.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sshaw/git-link.git";)
+             (url "https://github.com/sshaw/git-link";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3022,7 +3022,7 @@ the URL for a commit.  URLs are added to the kill ring.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/raxod502/apheleia.git";)
+             (url "https://github.com/raxod502/apheleia";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3099,7 +3099,7 @@ This package also includes relevant snippets for 
yasnippet.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rejeep/el-mock.el.git";)
+             (url "https://github.com/rejeep/el-mock.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3121,7 +3121,7 @@ Expectations, but it can be used in other contexts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ecukes/espuds.git";)
+             (url "https://github.com/ecukes/espuds";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3148,7 +3148,7 @@ definitions for testing with the Ecukes framework.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alvinfrancis/spark.git";)
+               (url "https://github.com/alvinfrancis/spark";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3170,7 +3170,7 @@ port of @code{cl-spark} to Emacs Lisp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dakrone/es-mode.git";)
+             (url "https://github.com/dakrone/es-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3200,7 +3200,7 @@ mode, which displays information about Elasticsearch 
clusters.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magnars/expand-region.el.git";)
+             (url "https://github.com/magnars/expand-region.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3222,7 +3222,7 @@ keep pressing the key until it selects what you want.  
There's also
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alpaker/Fill-Column-Indicator.git";)
+             (url "https://github.com/alpaker/Fill-Column-Indicator";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3243,7 +3243,7 @@ column by drawing a thin line down the length of the 
editing window.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ZungBang/emacs-grep-a-lot.git";)
+             (url "https://github.com/ZungBang/emacs-grep-a-lot";)
              (commit "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad")))
        (file-name (git-file-name name version))
        (sha256
@@ -3262,7 +3262,7 @@ column by drawing a thin line down the length of the 
editing window.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/yqrashawn/fd-dired.git";)
+                    (url "https://github.com/yqrashawn/fd-dired";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3283,7 +3283,7 @@ result.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dajva/rg.el.git";)
+             (url "https://github.com/dajva/rg.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3320,7 +3320,7 @@ then refine or modify the search results.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nonsequitur/inf-ruby.git";)
+             (url "https://github.com/nonsequitur/inf-ruby";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3365,7 +3365,7 @@ IRC bouncer with ERC.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/drewbarbs/erc-status-sidebar.git";)
+               (url "https://github.com/drewbarbs/erc-status-sidebar";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3389,7 +3389,7 @@ ERC, an Emacs client for IRC (Internet Relay Chat).  It 
relies on the
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cask/shut-up.git";)
+             (url "https://github.com/cask/shut-up";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3409,7 +3409,7 @@ Emacs shell script.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sviridov/undercover.el.git";)
+             (url "https://github.com/sviridov/undercover.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3433,7 +3433,7 @@ Lisp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tarsius/paren-face.git";)
+             (url "https://github.com/tarsius/paren-face";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3459,7 +3459,7 @@ subconsciously blend out the parentheses.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/purcell/page-break-lines.git";)
+             (url "https://github.com/purcell/page-break-lines";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3480,7 +3480,7 @@ as horizontal rules.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/skeeto/emacs-web-server.git";)
+             (url "https://github.com/skeeto/emacs-web-server";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3501,7 +3501,7 @@ serve files and directory listings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/skeeto/skewer-mode.git";)
+             (url "https://github.com/skeeto/skewer-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3528,7 +3528,7 @@ in Lisp modes.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Fuco1/litable.git";)
+                      (url "https://github.com/Fuco1/litable";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -3584,7 +3584,7 @@ naming style of a symbol.  It supports different naming 
conventions such as:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sabof/stripe-buffer.git";)
+             (url "https://github.com/sabof/stripe-buffer";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3630,7 +3630,7 @@ boxes, and more.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/unhammer/org-rich-yank.git";)
+             (url "https://github.com/unhammer/org-rich-yank";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3654,7 +3654,7 @@ been copied from an Emacs major mode.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/xfwduke/ob-erlang.git";)
+                      (url "https://github.com/xfwduke/ob-erlang";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -3676,7 +3676,7 @@ blocks with @code{org-babel} in @code{org-mode}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alf/ob-restclient.el.git";)
+               (url "https://github.com/alf/ob-restclient.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3699,7 +3699,7 @@ blocks with @code{org-babel} in @code{org-mode}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alphapapa/org-now.git";)
+               (url "https://github.com/alphapapa/org-now";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3724,7 +3724,7 @@ their original location with another.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Malabarba/rich-minority.git";)
+             (url "https://github.com/Malabarba/rich-minority";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3746,7 +3746,7 @@ mode-line.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dgutov/robe.git";)
+             (url "https://github.com/dgutov/robe";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3775,7 +3775,7 @@ method and constant name completion.")
                 (method git-fetch)
                 (uri (git-reference
                       ;; A better maintained fork of robot-mode.
-                      (url "https://github.com/jvalkeejarvi/robot-mode.git";)
+                      (url "https://github.com/jvalkeejarvi/robot-mode";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -3800,7 +3800,7 @@ completing keywords and smart indentation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/pezra/rspec-mode.git";)
+               (url "https://github.com/pezra/rspec-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3829,7 +3829,7 @@ snippets for yasnippet.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Malabarba/smart-mode-line.git";)
+             (url "https://github.com/Malabarba/smart-mode-line";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3855,7 +3855,7 @@ truncation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsorphanage/sr-speedbar.git";)
+               (url "https://github.com/emacsorphanage/sr-speedbar";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3878,7 +3878,7 @@ the speedbar window.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DamienCassou/shell-switcher.git";)
+             (url "https://github.com/DamienCassou/shell-switcher";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4276,7 +4276,7 @@ minibuffer to enable editing the minibuffer input in 
another buffer with
               (method git-fetch)
               (uri (git-reference
                     (commit "7147455230841744fb5b95dcbe03320313a77124")
-                    (url "https://github.com/gregsexton/ob-ipython.git";)))
+                    (url "https://github.com/gregsexton/ob-ipython";)))
               (file-name (git-file-name name version))
               (sha256
                (base32
@@ -4415,7 +4415,7 @@ build jobs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/company-mode/company-mode.git";)
+             (url "https://github.com/company-mode/company-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4454,7 +4454,7 @@ These are distributed in separate files and can be used 
individually.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/tumashu/company-posframe.git";)
+                      (url "https://github.com/tumashu/company-posframe";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -4531,7 +4531,7 @@ described on the homepage.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Sarcasm/company-irony.git";)
+                    (url "https://github.com/Sarcasm/company-irony";)
                     (commit (string-append "v" version))))
               (sha256 (base32
                        "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a"))
@@ -4553,7 +4553,7 @@ with irony-mode using clang-tooling.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Sarcasm/flycheck-irony.git";)
+                    (url "https://github.com/Sarcasm/flycheck-irony";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4577,7 +4577,7 @@ irony-mode do the syntax checking.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ikirill/irony-eldoc.git";)
+             (url "https://github.com/ikirill/irony-eldoc";)
              (commit "0df5831eaae264a25422b061eb2792aadde8b3f2")))
        (file-name (git-file-name name version))
        (sha256
@@ -4603,7 +4603,7 @@ for the current function or variable in the minibuffer.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/expez/company-quickhelp.git";)
+               (url "https://github.com/expez/company-quickhelp";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4628,7 +4628,7 @@ completion candidate when using the Company text 
completion framework.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/vspinu/math-symbol-lists.git";)
+               (url "https://github.com/vspinu/math-symbol-lists";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4687,7 +4687,7 @@ features:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/vspinu/company-math.git";)
+               (url "https://github.com/vspinu/company-math";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4734,7 +4734,7 @@ completion backends according to mode, and integrates with
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/oantolin/icomplete-vertical.git";)
+             (url "https://github.com/oantolin/icomplete-vertical";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4785,7 +4785,7 @@ succeeds.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/joostkremers/nswbuff.git";)
+               (url "https://github.com/joostkremers/nswbuff";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4807,7 +4807,7 @@ a customizable list.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/zk-phi/phi-search.git";)
+               (url "https://github.com/zk-phi/phi-search";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4829,7 +4829,7 @@ provide an incremental search that moves all fake cursors 
in sync.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/knu/phi-search-mc.el.git";)
+               (url "https://github.com/knu/phi-search-mc.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4854,7 +4854,7 @@ interactive searches to move multiple fake cursors.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magnars/multiple-cursors.el.git";)
+             (url "https://github.com/magnars/multiple-cursors.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4877,7 +4877,7 @@ simultaneous cursors.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/knu/mc-extras.el.git";)
+               (url "https://github.com/knu/mc-extras.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4924,7 +4924,7 @@ on context.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/tigersoldier/company-lsp.git";)
+                    (url "https://github.com/tigersoldier/company-lsp";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -4983,7 +4983,7 @@ commands and highlighting.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ashinn/scheme-complete.git";)
+               (url "https://github.com/ashinn/scheme-complete";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5012,7 +5012,7 @@ to a key in your preferred mode.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/supercollider/scel.git";)
+               (url "https://github.com/supercollider/scel";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5130,7 +5130,7 @@ identifiers in the MIT-Scheme documentation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fedeinthemix/emacs-constants.git";)
+             (url "https://github.com/fedeinthemix/emacs-constants";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5150,7 +5150,7 @@ constants and units into an Emacs buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/magnars/tagedit.git";)
+             (url "https://github.com/magnars/tagedit";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5174,7 +5174,7 @@ in @code{html-mode}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/slime/slime.git";)
+             (url "https://github.com/slime/slime";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5239,7 +5239,7 @@ for compilation, debugging, documentation lookup, and so 
on.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/auto-complete/popup-el.git";)
+             (url "https://github.com/auto-complete/popup-el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5360,7 +5360,7 @@ linting of manifests and integration with Puppet 
Debugger.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/chrisdone/god-mode.git";)
+             (url "https://github.com/chrisdone/god-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5384,7 +5384,7 @@ insertion mode.  When enabled all keys are implicitly 
prefixed with
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/paradoxxxzero/jinja2-mode.git";)
+             (url "https://github.com/paradoxxxzero/jinja2-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5483,7 +5483,7 @@ number.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/michaelklishin/cucumber.el.git";)
+                      (url "https://github.com/michaelklishin/cucumber.el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -5507,7 +5507,7 @@ Cucumber tool) user stories.  Also known by the name 
@code{cucumber.el}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sabof/org-bullets.git";)
+             (url "https://github.com/sabof/org-bullets";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5528,7 +5528,7 @@ Cucumber tool) user stories.  Also known by the name 
@code{cucumber.el}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/integral-dw/org-superstar-mode.git";)
+             (url "https://github.com/integral-dw/org-superstar-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5572,7 +5572,7 @@ Features degrade gracefully when viewed from terminal.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/marcinkoziej/org-pomodoro.git";)
+               (url "https://github.com/marcinkoziej/org-pomodoro";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5623,7 +5623,7 @@ started with 20 minutes.  All values are customizable.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alphapapa/org-sidebar.git";)
+             (url "https://github.com/alphapapa/org-sidebar";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5653,7 +5653,7 @@ overview of tasks in a subtree.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/org-trello/org-trello.git";)
+             (url "https://github.com/org-trello/org-trello";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5684,7 +5684,7 @@ organizer.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mtekman/org-tanglesync.el.git";)
+               (url "https://github.com/mtekman/org-tanglesync.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5732,7 +5732,7 @@ to their corresponding tangled blocks.")
      (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/jonathanchu/atom-one-dark-theme.git";)
+                    (url "https://github.com/jonathanchu/atom-one-dark-theme";)
                     (commit commit)))
               (sha256
                (base32
@@ -5752,7 +5752,7 @@ to their corresponding tangled blocks.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bbatsov/zenburn-emacs.git";)
+             (url "https://github.com/bbatsov/zenburn-emacs";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5822,7 +5822,7 @@ package provides a light and a dark variant.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/kunalb/poet.git";)
+               (url "https://github.com/kunalb/poet";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5866,7 +5866,7 @@ dark background.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/greduan/emacs-theme-gruvbox.git";)
+                    (url "https://github.com/greduan/emacs-theme-gruvbox";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -5895,7 +5895,7 @@ for the eyes.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/bruce/emacs-spacegray-theme.git";)
+                      (url "https://github.com/bruce/emacs-spacegray-theme";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -5974,7 +5974,7 @@ the game of chess.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsorphanage/4clojure.git";)
+               (url "https://github.com/emacsorphanage/4clojure";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5998,7 +5998,7 @@ answers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/belak/base16-emacs.git";)
+             (url "https://github.com/belak/base16-emacs";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6020,7 +6020,7 @@ single theme but a set of guidelines with numerous 
implementations.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hlissner/emacs-solaire-mode.git";)
+             (url "https://github.com/hlissner/emacs-solaire-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6043,7 +6043,7 @@ them easier to distinguish from other, less important 
buffers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/raxod502/prescient.el.git";)
+             (url "https://github.com/raxod502/prescient.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6068,7 +6068,7 @@ for Ivy and Company that make use of the library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/raxod502/selectrum.git";)
+             (url "https://github.com/raxod502/selectrum";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6094,7 +6094,7 @@ interface.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Fuco1/smartparens.git";)
+             (url "https://github.com/Fuco1/smartparens";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6131,7 +6131,7 @@ well as completely new features.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nschum/highlight-symbol.el.git";)
+               (url "https://github.com/nschum/highlight-symbol.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6165,7 +6165,7 @@ regardless of @code{highlight-symbol-idle-delay}.
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/wolray/symbol-overlay.git";)
+               (url "https://github.com/wolray/symbol-overlay";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6209,7 +6209,7 @@ regexp that matches all known keywords.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nex3/perspective-el.git";)
+             (url "https://github.com/nex3/perspective-el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6237,7 +6237,7 @@ perspective only its buffers are available by default.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Bad-ptr/persp-mode.el.git";)
+             (url "https://github.com/Bad-ptr/persp-mode.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6389,7 +6389,7 @@ parallel.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/tkf/emacs-request.git";)
+                    (url "https://github.com/tkf/emacs-request";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6576,7 +6576,7 @@ matched.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alexmurray/ivy-xref.git";)
+               (url "https://github.com/alexmurray/ivy-xref";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6601,7 +6601,7 @@ matched.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ecraven/ivy-pass.git";)
+               (url "https://github.com/ecraven/ivy-pass";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6628,7 +6628,7 @@ the password store @code{pass}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mkcms/ivy-yasnippet.git";)
+               (url "https://github.com/mkcms/ivy-yasnippet";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6660,7 +6660,7 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you 
have enabled
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Yevgnen/ivy-rich.git";)
+               (url "https://github.com/Yevgnen/ivy-rich";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6685,7 +6685,7 @@ show icons as well.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/abo-abo/avy.git";)
+             (url "https://github.com/abo-abo/avy";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6717,7 +6717,7 @@ windows.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/abo-abo/ace-window.git";)
+             (url "https://github.com/abo-abo/ace-window";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6746,7 +6746,7 @@ highlighted.  Pressing that character will switch to that 
window.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/victorhge/iedit.git";)
+               (url "https://github.com/victorhge/iedit";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6909,7 +6909,7 @@ allowing unprefixed keys to insert their respective 
characters as expected.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure-emacs/clojure-mode.git";)
+             (url "https://github.com/clojure-emacs/clojure-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6938,7 +6938,7 @@ It is recommended to use @code{clojure-mode} with Paredit 
or Smartparens.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cask/epl.git";)
+             (url "https://github.com/cask/epl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -7007,7 +7007,7 @@ be removed from the front.  This type of data structure 
is sometimes called an
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lunaryorn/pkg-info.el.git";)
+             (url "https://github.com/lunaryorn/pkg-info.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -7047,7 +7047,7 @@ ongoing operations.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ljos/sparql-mode.git";)
+             (url "https://github.com/ljos/sparql-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7143,7 +7143,7 @@ E-Prime forbids the use of the \"to be\" form to 
strengthen your writing.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/JuliaEditorSupport/julia-emacs.git";)
+               (url "https://github.com/JuliaEditorSupport/julia-emacs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7190,7 +7190,7 @@ to all the other commands, too.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mooz/js2-mode.git";)
+             (url "https://github.com/mooz/js2-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -7340,7 +7340,7 @@ provides the following features:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jrblevin/markdown-mode.git";)
+             (url "https://github.com/jrblevin/markdown-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7363,7 +7363,7 @@ in Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Somelauw/evil-markdown.git";)
+               (url "https://github.com/Somelauw/evil-markdown";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7435,7 +7435,7 @@ If you want to mark a folder manually as a project just 
create an empty
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/chrisbarrett/skeletor.el.git";)
+                      (url "https://github.com/chrisbarrett/skeletor.el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -7487,7 +7487,7 @@ and tooling.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/skeeto/elfeed.git";)
+             (url "https://github.com/skeeto/elfeed";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -7512,7 +7512,7 @@ and RSS, with a user interface inspired by notmuch.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/remyhonig/elfeed-org.git";)
+               (url "https://github.com/remyhonig/elfeed-org";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7552,7 +7552,7 @@ much easier.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sigma/el-x.git";)
+                    (url "https://github.com/sigma/el-x";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -7585,7 +7585,7 @@ provide the historic behavior of @code{flet}, as well as
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sigma/mocker.el.git";)
+                    (url "https://github.com/sigma/mocker.el";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -7613,7 +7613,7 @@ maximizes flexibility (at the expense of conciseness).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/technomancy/find-file-in-project.git";)
+                    (url "https://github.com/technomancy/find-file-in-project";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -7640,7 +7640,7 @@ functions to assist in reviewing changes on files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jorgenschaefer/pyvenv.git";)
+                    (url "https://github.com/jorgenschaefer/pyvenv";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -7675,7 +7675,7 @@ environments (virtualenv) inside Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url 
"https://github.com/DarthFennec/highlight-indent-guides.git";)
+               (url "https://github.com/DarthFennec/highlight-indent-guides";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7704,7 +7704,7 @@ buffers.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url 
"https://github.com/antonj/Highlight-Indentation-for-Emacs.git";)
+               (url 
"https://github.com/antonj/Highlight-Indentation-for-Emacs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7731,7 +7731,7 @@ indentation guides in Emacs:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jorgenschaefer/elpy.git";)
+                    (url "https://github.com/jorgenschaefer/elpy";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -7818,7 +7818,7 @@ completion, interactive development and more.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Fanael/rainbow-delimiters.git";)
+                    (url "https://github.com/Fanael/rainbow-delimiters";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -7893,7 +7893,7 @@ names, e.g., @samp{#0000ff} is displayed in white with a 
blue background.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Kungsgeten/ryo-modal.git";)
+               (url "https://github.com/Kungsgeten/ryo-modal";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7937,7 +7937,7 @@ window edge.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joostkremers/writeroom-mode.git";)
+             (url "https://github.com/joostkremers/writeroom-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -8008,7 +8008,7 @@ that uses the standard completion function 
completing-read.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/yoshiki/yaml-mode.git";)
+                    (url "https://github.com/yoshiki/yaml-mode";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -8081,7 +8081,7 @@ Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fxbois/web-mode.git";)
+             (url "https://github.com/fxbois/web-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8127,7 +8127,7 @@ ack, ag, helm and pt.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacs-helm/helm.git";)
+             (url "https://github.com/emacs-helm/helm";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8158,7 +8158,7 @@ not tied in the trap of backward compatibility.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-helm/helm-org.git";)
+               (url "https://github.com/emacs-helm/helm-org";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8181,7 +8181,7 @@ as well as features for editing search results.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacsorphanage/helm-swoop.git";)
+             (url "https://github.com/emacsorphanage/helm-swoop";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -8204,7 +8204,7 @@ for search-based navigation of buffers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-helm-ag.git";)
+             (url "https://github.com/syohex/emacs-helm-ag";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -8232,7 +8232,7 @@ as well as features for editing search results.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/bbatsov/helm-projectile.git";)
+               (url "https://github.com/bbatsov/helm-projectile";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8257,7 +8257,7 @@ as well as features for editing search results.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-taskrunner/emacs-taskrunner.git";)
+               (url "https://github.com/emacs-taskrunner/emacs-taskrunner";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8283,7 +8283,7 @@ multiple project types.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-taskrunner/ivy-taskrunner.git";)
+               (url "https://github.com/emacs-taskrunner/ivy-taskrunner";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8310,7 +8310,7 @@ Makefile targets.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-taskrunner/helm-taskrunner.git";)
+               (url "https://github.com/emacs-taskrunner/helm-taskrunner";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8337,7 +8337,7 @@ Makefile targets.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/abo-abo/helm-make.git";)
+               (url "https://github.com/abo-abo/helm-make";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8362,7 +8362,7 @@ target will call @code{compile} on it.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure-emacs/cider.git";)
+             (url "https://github.com/clojure-emacs/cider";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8407,7 +8407,7 @@ CIDER).")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/joaotavora/sly.git";)
+               (url "https://github.com/joaotavora/sly";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8849,7 +8849,7 @@ a popup window for previewing candidates.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/wcsmith/evil-args.git";)
+               (url "https://github.com/wcsmith/evil-args";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9142,7 +9142,7 @@ to search.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ananthakumaran/monky.git";)
+                    (url "https://github.com/ananthakumaran/monky";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -9169,7 +9169,7 @@ can selectively commit files, view the diffs, and other 
things.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sanel/monroe.git";)
+             (url "https://github.com/sanel/monroe";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -9332,7 +9332,7 @@ files that you would find in @file{contrib/} from the git 
repository.")))
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/lewang/flx.git";)
+              (url "https://github.com/lewang/flx";)
               (commit (string-append "v" version))))
        (sha256
         (base32
@@ -9453,7 +9453,7 @@ package provides the Emacs theme.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/auto-complete/auto-complete.git";)
+              (url "https://github.com/auto-complete/auto-complete";)
               (commit (string-append "v" version))))
        (sha256
         (base32
@@ -9480,7 +9480,7 @@ extensibility.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ajc/nginx-mode.git";)
+             (url "https://github.com/ajc/nginx-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9521,7 +9521,7 @@ Streams are implemented as delayed evaluation of cons 
cells.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsmirror/cl-print.git";)
+               (url "https://github.com/emacsmirror/cl-print";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9544,7 +9544,7 @@ please.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsmirror/el-search.git";)
+               (url "https://github.com/emacsmirror/el-search";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9567,7 +9567,7 @@ procedures for emacs-lisp-mode.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Wilfred/ht.el.git";)
+             (url "https://github.com/Wilfred/ht.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -9594,7 +9594,7 @@ provides functions to convert hash tables from and to 
alists and plists.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/aki2o/log4e.git";)
+             (url "https://github.com/aki2o/log4e";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9624,7 +9624,7 @@ you to deal with multiple log levels.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tekai/gntp.el.git";)
+             (url "https://github.com/tekai/gntp.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9647,7 +9647,7 @@ notifications.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jwiegley/alert.git";)
+             (url "https://github.com/jwiegley/alert";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9694,7 +9694,7 @@ a (typically) noncontiguous set of text.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/iqbalansari/mu4e-alert.git";)
+             (url "https://github.com/iqbalansari/mu4e-alert";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9796,7 +9796,7 @@ been adapted to work with mu4e.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joaotavora/yasnippet.git";)
+             (url "https://github.com/joaotavora/yasnippet";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10029,7 +10029,7 @@ package.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/skeeto/emacs-memoize.git";)
+             (url "https://github.com/skeeto/emacs-memoize";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10054,7 +10054,7 @@ memoizing functions.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/coldnew/linum-relative.git";)
+             (url "https://github.com/coldnew/linum-relative";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10074,7 +10074,7 @@ number on the left margin in Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nonsequitur/idle-highlight-mode.git";)
+             (url "https://github.com/nonsequitur/idle-highlight-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10096,7 +10096,7 @@ number on the left margin in Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/marsmining/ox-twbs.git";)
+             (url "https://github.com/marsmining/ox-twbs";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10119,7 +10119,7 @@ jQuery and Bootstrap resources included via osscdn.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/daimrod/highlight-sexp.git";)
+             (url "https://github.com/daimrod/highlight-sexp";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10141,7 +10141,7 @@ jQuery and Bootstrap resources included via osscdn.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/zk-phi/highlight-stages.git";)
+               (url "https://github.com/zk-phi/highlight-stages";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10292,7 +10292,7 @@ the hunks and revert them selectively.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/myrjola/diminish.el.git";)
+             (url "https://github.com/myrjola/diminish.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10446,7 +10446,7 @@ to the home page or read the comments in the source 
file,
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hniksic/emacs-htmlize.git";)
+             (url "https://github.com/hniksic/emacs-htmlize";)
              (commit (string-append "release/" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10467,7 +10467,7 @@ fonts is supported.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/philjackson/xmlgen.git";)
+             (url "https://github.com/philjackson/xmlgen";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10493,7 +10493,7 @@ conversion for Emacs Lisp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cdominik/cdlatex.git";)
+             (url "https://github.com/cdominik/cdlatex";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10519,7 +10519,7 @@ constructs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tumashu/cnfonts.git";)
+             (url "https://github.com/tumashu/cnfonts";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10539,7 +10539,7 @@ configuration of Chinese fonts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ejmr/php-mode.git";)
+             (url "https://github.com/ejmr/php-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10563,7 +10563,7 @@ documentation search and a source and class browser.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pitkali/pos-tip.git";)
+             (url "https://github.com/pitkali/pos-tip";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10589,7 +10589,7 @@ function to be used by other frontend programs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tumashu/pyim-basedict.git";)
+             (url "https://github.com/tumashu/pyim-basedict";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10657,7 +10657,7 @@ posframe is a child frame displayed within its root 
window's buffer.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tumashu/el2org.git";)
+             (url "https://github.com/tumashu/el2org";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10677,7 +10677,7 @@ to org file, you can use this tool to write orgify 
commentary.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Wilfred/mustache.el.git";)
+             (url "https://github.com/Wilfred/mustache.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10704,7 +10704,7 @@ and lambdas.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tumashu/org2web.git";)
+             (url "https://github.com/tumashu/org2web";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10956,7 +10956,7 @@ and supports the use of a mouse.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bruceravel/gnuplot-mode.git";)
+             (url "https://github.com/bruceravel/gnuplot-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11061,7 +11061,7 @@ addition of surrounding pairs, such as parentheses and 
quotes, in evil mode.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/linktohack/evil-commentary.git";)
+             (url "https://github.com/linktohack/evil-commentary";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11086,7 +11086,7 @@ lines, and @code{gc} to comment out the target of a 
motion.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rejeep/ansi.el.git";)
+             (url "https://github.com/rejeep/ansi.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11113,7 +11113,7 @@ as bold, underscore or italic.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rejeep/commander.el.git";)
+             (url "https://github.com/rejeep/commander.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11162,7 +11162,7 @@ one if it fails.")
      (origin
        (method git-fetch)
        (uri (git-reference
-            (url "https://github.com/rejeep/ert-runner.el.git";)
+            (url "https://github.com/rejeep/ert-runner.el";)
             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11211,7 +11211,7 @@ running tests easier.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/promethial/xtest.git";)
+                    (url "https://github.com/promethial/xtest";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -11233,7 +11233,7 @@ running tests easier.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/purcell/disable-mouse.git";)
+             (url "https://github.com/purcell/disable-mouse";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11255,7 +11255,7 @@ running a customisable handler command (@code{ignore} 
by default). ")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gongo/json-reformat.git";)
+             (url "https://github.com/gongo/json-reformat";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11301,7 +11301,7 @@ running a customisable handler command (@code{ignore} 
by default). ")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Sterlingg/json-snatcher.git";)
+             (url "https://github.com/Sterlingg/json-snatcher";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11321,7 +11321,7 @@ a @url{http://json.org/, JSON} file.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joshwnj/json-mode.git";)
+             (url "https://github.com/joshwnj/json-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11368,7 +11368,7 @@ JSON objects.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/pashky/restclient.el.git";)
+                      (url "https://github.com/pashky/restclient.el";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -11420,7 +11420,7 @@ whitespace in the buffer was initially clean.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nicferrier/eimp.git";)
+               (url "https://github.com/nicferrier/eimp";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11457,7 +11457,7 @@ the actual transformations.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Fuco1/dired-hacks.git";)
+                      (url "https://github.com/Fuco1/dired-hacks";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -11523,7 +11523,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do 
the job of display.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/justbur/emacs-which-key.git";)
+             (url "https://github.com/justbur/emacs-which-key";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11577,7 +11577,7 @@ list of commands is displayed in a handy popup.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lewang/ws-butler.git";)
+                    (url "https://github.com/lewang/ws-butler";)
                     (commit "323b651dd70ee40a25accc940b8f80c3a3185205")))
               (file-name (git-file-name name version))
               (sha256
@@ -11628,7 +11628,7 @@ when browsing files with Dired.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/et2010/org-edit-latex.git";)
+             (url "https://github.com/et2010/org-edit-latex";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11654,7 +11654,7 @@ src block.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-emamux.git";)
+             (url "https://github.com/syohex/emacs-emamux";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11748,7 +11748,7 @@ at point.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-git-messenger.git";)
+             (url "https://github.com/syohex/emacs-git-messenger";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11776,7 +11776,7 @@ internally.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tumashu/gitpatch.git";)
+             (url "https://github.com/tumashu/gitpatch";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11824,7 +11824,7 @@ the nick color and the background color
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hrs/engine-mode.git";)
+             (url "https://github.com/hrs/engine-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11845,7 +11845,7 @@ query them from the comfort of your editor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/david-christiansen/prop-menu-el.git";)
+             (url "https://github.com/david-christiansen/prop-menu-el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11880,7 +11880,7 @@ key.  Optionally, a mouse pop-up can be added by binding
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/idris-hackers/idris-mode.git";)
+               (url "https://github.com/idris-hackers/idris-mode";)
                (commit commit)))
          (file-name (git-file-name name commit))
          (sha256
@@ -11905,7 +11905,7 @@ the latest versions of Idris 1.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rmuslimov/browse-at-remote.git";)
+             (url "https://github.com/rmuslimov/browse-at-remote";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11937,7 +11937,7 @@ It supports dired buffers and opens them in tree mode 
at destination.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/abo-abo/tiny.git";)
+               (url "https://github.com/abo-abo/tiny";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -12136,7 +12136,7 @@ value of the access token.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jorgenschaefer/circe.git";)
+             (url "https://github.com/jorgenschaefer/circe";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12192,7 +12192,7 @@ through them using @key{C-c C-SPC}.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/yuya373/emacs-slack.git";)
+                      (url "https://github.com/yuya373/emacs-slack";)
                       (commit commit)))
                 (file-name (git-file-name name commit))
                 (sha256
@@ -12227,7 +12227,7 @@ messaging service.")
     (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/szermatt/emacs-bash-completion.git";)
+            (url "https://github.com/szermatt/emacs-bash-completion";)
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
@@ -12300,7 +12300,7 @@ in a generalized CSV (character-separated values) 
format.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/holomorph/transmission.git";)
+             (url "https://github.com/holomorph/transmission";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12329,7 +12329,7 @@ contexts.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/polymode/polymode.git";)
+                    (url "https://github.com/polymode/polymode";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -12383,7 +12383,7 @@ literate programming tools for exporting, weaving and 
tangling.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/polymode/poly-org.git";)
+             (url "https://github.com/polymode/poly-org";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12410,7 +12410,7 @@ buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kaushalmodi/eless.git";)
+             (url "https://github.com/kaushalmodi/eless";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12462,7 +12462,7 @@ Feautures:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/redguardtoo/evil-matchit.git";)
+             (url "https://github.com/redguardtoo/evil-matchit";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12485,7 +12485,7 @@ evil mode using @kbd{%}.  It is a port of 
@code{matchit} for Vim.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/expez/evil-smartparens.git";)
+             (url "https://github.com/expez/evil-smartparens";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12509,7 +12509,7 @@ emulates Vim features and provides Vim-like key 
bindings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/blorbx/evil-quickscope.git";)
+             (url "https://github.com/blorbx/evil-quickscope";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12538,7 +12538,7 @@ features and provides Vim-like key bindings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dbrock/bongo.git";)
+             (url "https://github.com/dbrock/bongo";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12586,7 +12586,7 @@ navigation with the grails mode.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/takaxp/org-tree-slide.git";)
+                      (url "https://github.com/takaxp/org-tree-slide";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -12610,7 +12610,7 @@ navigation with the grails mode.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ieure/scratch-el.git";)
+                      (url "https://github.com/ieure/scratch-el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -12647,7 +12647,7 @@ formatting rules for that language.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nicferrier/emacs-kv.git";)
+             (url "https://github.com/nicferrier/emacs-kv";)
              (commit "721148475bce38a70e0b678ba8aa923652e8900e")))
        (file-name (git-file-name name version))
        (sha256
@@ -12672,7 +12672,7 @@ Lisp.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/tali713/esxml.git";)
+                    (url "https://github.com/tali713/esxml";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -12767,7 +12767,7 @@ Features:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cute-jumper/epipe.git";)
+             (url "https://github.com/cute-jumper/epipe";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12811,7 +12811,7 @@ the pipeline, featuring the support for running 
@code{emacsclient}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-hcl-mode.git";)
+             (url "https://github.com/syohex/emacs-hcl-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12833,7 +12833,7 @@ highlighting and indentation support.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-terraform-mode.git";)
+             (url "https://github.com/syohex/emacs-terraform-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12933,7 +12933,7 @@ to with quicklink-style selections.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jrblevin/deft.git";)
+             (url "https://github.com/jrblevin/deft";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12955,7 +12955,7 @@ directories of plain text notes, inspired by Notational 
Velocity.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-anzu.git";)
+             (url "https://github.com/syohex/emacs-anzu";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -12999,7 +12999,7 @@ region of the buffer, while the latter works on 
rectangular selections.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/smihica/emmet-mode.git";)
+                      (url "https://github.com/smihica/emmet-mode";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -13023,7 +13023,7 @@ used with SGML-like languages: XML, HTML, XHTML, XSL, 
etc.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ergoemacs/ergoemacs-mode.git";)
+               (url "https://github.com/ergoemacs/ergoemacs-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13085,7 +13085,7 @@ standard Unix password manager\").")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/DamienCassou/auth-password-store.git";)
+               (url "https://github.com/DamienCassou/auth-password-store";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13111,7 +13111,7 @@ standard Unix password manager\").")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/NicolasPetton/pass.git";)
+             (url "https://github.com/NicolasPetton/pass";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13246,7 +13246,7 @@ match and total match information in the mode-line in 
various search modes.")
     (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/skeeto/elisp-finalize.git";)
+            (url "https://github.com/skeeto/elisp-finalize";)
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
@@ -13270,7 +13270,7 @@ object has been freed.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/skeeto/emacsql.git";)
+                    (url "https://github.com/skeeto/emacsql";)
                     (commit (string-append version))))
               (file-name (git-file-name name version))
               (sha256
@@ -13352,7 +13352,7 @@ object @code{nil} corresponds 1:1 with @code{NULL} in 
the database.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacscollective/closql.git";)
+               (url "https://github.com/emacscollective/closql";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13381,7 +13381,7 @@ add any additional instance slots.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacscollective/epkg.git";)
+               (url "https://github.com/emacscollective/epkg";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13423,7 +13423,7 @@ Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/purcell/elisp-slime-nav.git";)
+             (url "https://github.com/purcell/elisp-slime-nav";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13445,7 +13445,7 @@ in @code{emacs-lisp-mode}, together with an elisp 
equivalent of
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacsorphanage/dedicated.git";)
+             (url "https://github.com/emacsorphanage/dedicated";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13472,7 +13472,7 @@ the source file.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/paul-issartel/nnreddit.git";)
+                      (url "https://github.com/paul-issartel/nnreddit";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -13493,7 +13493,7 @@ newsreader.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mickeynp/makey.git";)
+             (url "https://github.com/mickeynp/makey";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13537,7 +13537,7 @@ text-mode (i.e. Org-mode).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/alphapapa/outshine.git";)
+                    (url "https://github.com/alphapapa/outshine";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -13588,7 +13588,7 @@ a heuristic based on frequency and recency.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/alphapapa/org-recent-headings.git";)
+                    (url "https://github.com/alphapapa/org-recent-headings";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -13818,7 +13818,7 @@ files to be expanded upon opening them.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joostkremers/parsebib.git";)
+             (url "https://github.com/joostkremers/parsebib";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13838,7 +13838,7 @@ files to be expanded upon opening them.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/joostkremers/ebib.git";)
+             (url "https://github.com/joostkremers/ebib";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13868,7 +13868,7 @@ with (La)TeX mode, Org mode and other Emacs editing 
modes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cpitclaudel/biblio.el.git";)
+             (url "https://github.com/cpitclaudel/biblio.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -13899,7 +13899,7 @@ automatically fetched from well-curated sources, and 
formatted as BibTeX.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tmalsburg/helm-bibtex.git";)
+               (url "https://github.com/tmalsburg/helm-bibtex";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -13945,7 +13945,7 @@ arXiv, Google Scholar, Library of Congress, etc.
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/flexibeast/ewmctrl.git";)
+               (url "https://github.com/flexibeast/ewmctrl";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14002,7 +14002,7 @@ and @code{erc-send-modify-hook} to download and show 
images.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-helm-gtags.git";)
+             (url "https://github.com/syohex/emacs-helm-gtags";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14024,7 +14024,7 @@ and @code{erc-send-modify-hook} to download and show 
images.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rolandwalker/list-utils.git";)
+             (url "https://github.com/rolandwalker/list-utils";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14043,7 +14043,7 @@ and @code{erc-send-modify-hook} to download and show 
images.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacsfodder/move-text.git";)
+             (url "https://github.com/emacsfodder/move-text";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14084,7 +14084,7 @@ schema validation.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/istib/rainbow-blocks.git";)
+                      (url "https://github.com/istib/rainbow-blocks";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -14107,7 +14107,7 @@ orient yourself in the code, and tell which statements 
are at a given level.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DamienCassou/hierarchy.git";)
+             (url "https://github.com/DamienCassou/hierarchy";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14135,7 +14135,7 @@ navigate and display hierarchy structures.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsorphanage/tree-mode.git";)
+               (url "https://github.com/emacsorphanage/tree-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14155,7 +14155,7 @@ navigate and display hierarchy structures.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ahungry/md4rd.git";)
+                    (url "https://github.com/ahungry/md4rd";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -14184,7 +14184,7 @@ navigate and display hierarchy structures.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/flexibeast/pulseaudio-control.git";)
+               (url "https://github.com/flexibeast/pulseaudio-control";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14216,7 +14216,7 @@ navigate and display hierarchy structures.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/doublep/datetime.git";)
+             (url "https://github.com/doublep/datetime";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14239,7 +14239,7 @@ timestamps and date-time format strings library for 
Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/theodorewiles/org-mind-map.git";)
+               (url "https://github.com/theodorewiles/org-mind-map";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14262,7 +14262,7 @@ timestamps and date-time format strings library for 
Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mojochao/npm-mode.git";)
+             (url "https://github.com/mojochao/npm-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14303,7 +14303,7 @@ functions provided by @file{subr.el}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/re5et/itail.git";)
+               (url "https://github.com/re5et/itail";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14326,7 +14326,7 @@ tramp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Wilfred/loop.el.git";)
+             (url "https://github.com/Wilfred/loop.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14353,7 +14353,7 @@ continue.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Wilfred/elisp-refs.git";)
+             (url "https://github.com/Wilfred/elisp-refs";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14389,7 +14389,7 @@ confused by comments or @code{foo-bar} matching 
@code{foo}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/bbatsov/crux.git";)
+               (url "https://github.com/bbatsov/crux";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14410,7 +14410,7 @@ confused by comments or @code{foo-bar} matching 
@code{foo}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stsquad/emacs_chrome.git";)
+             (url "https://github.com/stsquad/emacs_chrome";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14488,7 +14488,7 @@ macro takes a first argument (whose value must be an 
alist) and a body.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jschaf/esup.git";)
+               (url "https://github.com/jschaf/esup";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14512,7 +14512,7 @@ your Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/iqbalansari/restart-emacs.git";)
+               (url "https://github.com/iqbalansari/restart-emacs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14532,7 +14532,7 @@ within Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/syohex/emacs-sourcemap.git";)
+             (url "https://github.com/syohex/emacs-sourcemap";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14551,7 +14551,7 @@ within Emacs.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/joddie/macrostep.git";)
+                      (url "https://github.com/joddie/macrostep";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -14601,7 +14601,7 @@ until the top-level form is no longer a macro call.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Fanael/parent-mode.git";)
+             (url "https://github.com/Fanael/parent-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14638,7 +14638,7 @@ until the top-level form is no longer a macro call.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsmirror/isearch-prop.git";)
+               (url "https://github.com/emacsmirror/isearch-prop";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14664,7 +14664,7 @@ until the top-level form is no longer a macro call.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ptrv/company-lua.git";)
+               (url "https://github.com/ptrv/company-lua";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14692,7 +14692,7 @@ until the top-level form is no longer a macro call.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DamienCassou/beginend.git";)
+             (url "https://github.com/DamienCassou/beginend";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14719,7 +14719,7 @@ key again.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dimitri/mbsync-el.git";)
+               (url "https://github.com/dimitri/mbsync-el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14742,7 +14742,7 @@ within Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/purcell/ibuffer-projectile.git";)
+               (url "https://github.com/purcell/ibuffer-projectile";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14836,7 +14836,7 @@ documentation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hylang/hy-mode.git";)
+             (url "https://github.com/hylang/hy-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -14858,7 +14858,7 @@ documentation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/yasuyk/web-beautify.git";)
+             (url "https://github.com/yasuyk/web-beautify";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -14879,7 +14879,7 @@ CSS, JavaScript, JSON.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/yuutayamada/helm-shell-history.git";)
+               (url "https://github.com/yuutayamada/helm-shell-history";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14939,7 +14939,7 @@ their meaning for the current Emacs major-mode.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jkitchin/org-ref.git";)
+               (url "https://github.com/jkitchin/org-ref";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -14987,7 +14987,7 @@ notes.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/yjwen/org-reveal.git";)
+                      (url "https://github.com/yjwen/org-reveal";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15033,7 +15033,7 @@ files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nickmccurdy/add-hooks.git";)
+             (url "https://github.com/nickmccurdy/add-hooks";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15053,7 +15053,7 @@ duplicate hook and function names further into a single 
declarative call.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Malabarba/fancy-narrow.git";)
+             (url "https://github.com/Malabarba/fancy-narrow";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15078,7 +15078,7 @@ buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/for-GET/know-your-http-well.git";)
+             (url "https://github.com/for-GET/know-your-http-well";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15113,7 +15113,7 @@ buffer.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alphapapa/navi.git";)
+               (url "https://github.com/alphapapa/navi";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15140,7 +15140,7 @@ buffer.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/zk-phi/download-region.git";)
+               (url "https://github.com/zk-phi/download-region";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15161,7 +15161,7 @@ downloading manager for Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Wilfred/helpful.git";)
+             (url "https://github.com/Wilfred/helpful";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15210,7 +15210,7 @@ and doesn't require memorisation of commands.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/doublep/logview.git";)
+             (url "https://github.com/doublep/logview";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15266,7 +15266,7 @@ functions.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dholm/benchmark-init-el.git";)
+             (url "https://github.com/dholm/benchmark-init-el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15288,7 +15288,7 @@ time is being spent during Emacs startup in order to 
optimize startup time.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/terranpro/magit-gerrit.git";)
+                      (url "https://github.com/terranpro/magit-gerrit";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15313,7 +15313,7 @@ Emacs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/danielma/magit-org-todos.el.git";)
+               (url "https://github.com/danielma/magit-org-todos.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15363,7 +15363,7 @@ Magit.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cosmicexplorer/f3.git";)
+             (url "https://github.com/cosmicexplorer/f3";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15385,7 +15385,7 @@ Magit.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/buzztaiki/lice-el.git";)
+                      (url "https://github.com/buzztaiki/lice-el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15411,7 +15411,7 @@ Magit.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nashamri/academic-phrases.git";)
+               (url "https://github.com/nashamri/academic-phrases";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15445,7 +15445,7 @@ browse the phrases by the paper section and fill-in the 
blanks if required.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/abo-abo/auto-yasnippet.git";)
+                      (url "https://github.com/abo-abo/auto-yasnippet";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15474,7 +15474,7 @@ yasnippet fields and mirrors to be.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Fanael/highlight-numbers.git";)
+             (url "https://github.com/Fanael/highlight-numbers";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15594,7 +15594,7 @@ fixed-pitch,everything else becomes variable-pitch.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/benma/visual-regexp.el.git";)
+             (url "https://github.com/benma/visual-regexp.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15617,7 +15617,7 @@ interactive visual feedback.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Lindydancer/faceup.git";)
+               (url "https://github.com/Lindydancer/faceup";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15675,7 +15675,7 @@ perform regression test for packages that provide 
font-lock rules.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mkcms/grep-context.git";)
+               (url "https://github.com/mkcms/grep-context";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15703,7 +15703,7 @@ compilation/grep buffers.  Works with @code{wgrep}, 
@code{ack}, @code{ag},
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-helm/helm-firefox.git";)
+               (url "https://github.com/emacs-helm/helm-firefox";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15725,7 +15725,7 @@ compilation/grep buffers.  Works with @code{wgrep}, 
@code{ack}, @code{ag},
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mkcms/interactive-align.git";)
+             (url "https://github.com/mkcms/interactive-align";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15767,7 +15767,7 @@ decrease the number at point.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Fanael/highlight-defined.git";)
+             (url "https://github.com/Fanael/highlight-defined";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15788,7 +15788,7 @@ macros, faces and variables.  To enable call 
@code{highlight-defined-mode}. ")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DogLooksGood/parinfer-mode.git";)
+             (url "https://github.com/DogLooksGood/parinfer-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15812,7 +15812,7 @@ keep Parens and Indentation inline with one another.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/emacs-helm/helm-eww.git";)
+                    (url "https://github.com/emacs-helm/helm-eww";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -15836,7 +15836,7 @@ bookmarks and history.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/stumpwm/stumpwm-contrib.git";)
+                      (url "https://github.com/stumpwm/stumpwm-contrib";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -15882,7 +15882,7 @@ bookmarks and history.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/creichert/ido-vertical-mode.el.git";)
+             (url "https://github.com/creichert/ido-vertical-mode.el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15901,7 +15901,7 @@ bookmarks and history.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Fanael/wordgen.el.git";)
+             (url "https://github.com/Fanael/wordgen.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15945,7 +15945,7 @@ the previously visible buffer part after each scroll.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dgutov/highlight-escape-sequences.git";)
+               (url "https://github.com/dgutov/highlight-escape-sequences";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -15965,7 +15965,7 @@ Emacs minor mode to escape sequences in code.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rakanalh/emacs-dashboard.git";)
+             (url "https://github.com/rakanalh/emacs-dashboard";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -15999,7 +15999,7 @@ sections for bookmarks, projectil projects, org-agenda 
and more. ")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/anwyn/slime-company.git";)
+             (url "https://github.com/anwyn/slime-company";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -16046,7 +16046,7 @@ interactive loop.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/xiongtx/eros.git";)
+               (url "https://github.com/xiongtx/eros";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16068,7 +16068,7 @@ interactive loop.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tuhdo/semantic-stickyfunc-enhance.git";)
+               (url "https://github.com/tuhdo/semantic-stickyfunc-enhance";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16092,7 +16092,7 @@ scroll up to read the function name and then scroll 
down to original position.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ryuslash/git-auto-commit-mode.git";)
+             (url "https://github.com/ryuslash/git-auto-commit-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -16138,7 +16138,7 @@ on drag distance.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/iquiw/company-restclient.git";)
+             (url "https://github.com/iquiw/company-restclient";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -16203,7 +16203,7 @@ through the symbol: @command{this-fn}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jacktasia/dumb-jump.git";)
+             (url "https://github.com/jacktasia/dumb-jump";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -16248,7 +16248,7 @@ Dumb Jump performs best with The Silver Searcher 
@command{ag} or ripgrep
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/bgamari/dts-mode.git";)
+               (url "https://github.com/bgamari/dts-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16296,7 +16296,7 @@ systems.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsmirror/isearch-plus.git";)
+               (url "https://github.com/emacsmirror/isearch-plus";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16418,7 +16418,7 @@ be changed by customizing the appropriate variables.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dengste/org-caldav.git";)
+               (url "https://github.com/dengste/org-caldav";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16444,7 +16444,7 @@ calendar.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/egh/zotxt-emacs.git";)
+             (url "https://github.com/egh/zotxt-emacs";)
              (commit "23a4a9f74a658222027d53a9a83cd4bcc583ca8b")))
        (file-name (git-file-name name version))
        (sha256
@@ -16546,7 +16546,7 @@ defaults.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gabesoft/evil-mc.git";)
+               (url "https://github.com/gabesoft/evil-mc";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -16880,7 +16880,7 @@ from @code{emms-source-file-default-directory}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacs-helm/helm-exwm.git";)
+             (url "https://github.com/emacs-helm/helm-exwm";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -16971,7 +16971,7 @@ projects unrelated to current-buffer.
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-helm/helm-mu.git";)
+               (url "https://github.com/emacs-helm/helm-mu";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -17379,7 +17379,7 @@ and @code{C++} files through the @code{ccls} language 
server.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Kungsgeten/org-brain.git";)
+             (url "https://github.com/Kungsgeten/org-brain";)
              (commit "3faf9303af3f2356e3444e69c22dc6c5774047d1")))
        (file-name (git-file-name name version))
        (sha256
@@ -17476,7 +17476,7 @@ and 'text viewing modes' respectively.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sensorflo/adoc-mode.git";)
+             (url "https://github.com/sensorflo/adoc-mode";)
              (commit (string-append "V" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -17671,7 +17671,7 @@ buffer displays recursive dir sizes.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/stsquad/dired-rsync.git";)
+                    (url "https://github.com/stsquad/dired-rsync";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -17988,7 +17988,7 @@ files are easily readable and they work nicely with 
version control systems.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/domtronn/all-the-icons.el.git";)
+             (url "https://github.com/domtronn/all-the-icons.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -18027,7 +18027,7 @@ scaling of and anti aliasing of the icons.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/bcbcarl/emacs-wttrin.git";)
+                      (url "https://github.com/bcbcarl/emacs-wttrin";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -18052,7 +18052,7 @@ scaling of and anti aliasing of the icons.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/browse-kill-ring/browse-kill-ring.git";)
+               (url "https://github.com/browse-kill-ring/browse-kill-ring";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -18075,7 +18075,7 @@ of trying to find that piece of text you know you 
killed a while back?  Then
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/milkypostman/powerline.git";)
+             (url "https://github.com/milkypostman/powerline";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -18097,7 +18097,7 @@ themes comes with the package.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/TheBB/spaceline.git";)
+             (url "https://github.com/TheBB/spaceline";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -18267,7 +18267,7 @@ classes like @command{<gtk-window>}.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ShingoFukuyama/ov.el.git";)
+                    (url "https://github.com/ShingoFukuyama/ov.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -18288,7 +18288,7 @@ Emacs.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/jgkamat/matrix-client-el.git";)
+                      (url "https://github.com/jgkamat/matrix-client-el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -18335,7 +18335,7 @@ RPC channels with users and other software.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vspinu/sesman.git";)
+             (url "https://github.com/vspinu/sesman";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -18369,7 +18369,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, 
SLIME etc.)")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jorgenschaefer/emacs-buttercup.git";)
+             (url "https://github.com/jorgenschaefer/emacs-buttercup";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -18427,7 +18427,7 @@ too ambiguous and navigation in the result buffer.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/alphapapa/frame-purpose.el.git";)
+                    (url "https://github.com/alphapapa/frame-purpose.el";)
                     (commit version)))
               (sha256
                (base32
@@ -18453,7 +18453,7 @@ other frame parameters.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/stardiviner/arduino-mode.git";)
+                      (url "https://github.com/stardiviner/arduino-mode";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -18489,7 +18489,7 @@ other frame parameters.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/noctuid/annalist.el.git";)
+                      (url "https://github.com/noctuid/annalist.el";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -18526,7 +18526,7 @@ advice to be recorded and displayed.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/noctuid/general.el.git";)
+               (url "https://github.com/noctuid/general.el";)
                (commit commit)))
          (sha256
           (base32 "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv"))
@@ -18773,7 +18773,7 @@ to open SQLite databases.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/NixOS/nix-mode.git";)
+             (url "https://github.com/NixOS/nix-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -18846,7 +18846,7 @@ stored playlists.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/akermu/emacs-libvterm.git";)
+                      (url "https://github.com/akermu/emacs-libvterm";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -18911,7 +18911,7 @@ display a terminal in an Emacs buffer.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jorenvo/simple-mpc.git";)
+               (url "https://github.com/jorenvo/simple-mpc";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -18956,7 +18956,7 @@ indentation and a command to plot the file.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/Lindydancer/cmake-font-lock.git";)
+                      (url "https://github.com/Lindydancer/cmake-font-lock";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -19271,7 +19271,7 @@ constant expressions.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/spotify/dockerfile-mode.git";)
+               (url "https://github.com/spotify/dockerfile-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -19295,7 +19295,7 @@ the standard @code{Dockerfile} file format.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacs-lsp/lsp-mode.git";)
+             (url "https://github.com/emacs-lsp/lsp-mode";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -19325,7 +19325,7 @@ Projectile.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Alexander-Miller/pfuture.git";)
+                      (url "https://github.com/Alexander-Miller/pfuture";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -19346,7 +19346,7 @@ processes for Emacs")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Alexander-Miller/treemacs.git";)
+                    (url "https://github.com/Alexander-Miller/treemacs";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -19499,7 +19499,7 @@ files in Elisp.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/emacs-lsp/lsp-java.git";)
+                    (url "https://github.com/emacs-lsp/lsp-java";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -19526,7 +19526,7 @@ files in Elisp.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/emacs-lsp/lsp-ui.git";)
+                    (url "https://github.com/emacs-lsp/lsp-ui";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -19554,7 +19554,7 @@ and code peeking.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/phenix3443/lsp-lua-emmy.git";)
+                      (url "https://github.com/phenix3443/lsp-lua-emmy";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -19578,7 +19578,7 @@ and code peeking.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/emacs-lsp/lsp-ivy.git";)
+                      (url "https://github.com/emacs-lsp/lsp-ivy";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -19605,7 +19605,7 @@ workspaces with a LSP-compliant server running.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/emacs-lsp/helm-lsp.git";)
+                      (url "https://github.com/emacs-lsp/helm-lsp";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -19725,7 +19725,7 @@ commands (a prefix and a suffix) we prefer to call it 
just a \"transient\".")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/magit/forge.git";)
+               (url "https://github.com/magit/forge";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -19771,7 +19771,7 @@ comfort of Magit and the rest of Emacs.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/jojojames/matcha.git";)
+                      (url "https://github.com/jojojames/matcha";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -20087,7 +20087,7 @@ compatible with Emacs' shell modes.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/justbur/emacs-vdiff.git";)
+               (url "https://github.com/justbur/emacs-vdiff";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -20465,7 +20465,7 @@ and searching through @code{Ctags} files.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/wpcarro/ivy-clipmenu.el.git";)
+                      (url "https://github.com/wpcarro/ivy-clipmenu.el";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -20515,7 +20515,7 @@ copied into @code{org-mode} buffers.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dash-docs-el/dash-docs.git";)
+               (url "https://github.com/dash-docs-el/dash-docs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -20562,7 +20562,7 @@ copied into @code{org-mode} buffers.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/areina/helm-dash.git";)
+               (url "https://github.com/areina/helm-dash";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -20588,7 +20588,7 @@ Dash docsets.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dash-docs-el/counsel-dash.git";)
+               (url "https://github.com/dash-docs-el/counsel-dash";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -20611,7 +20611,7 @@ through Dash docsets.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/chenyanming/calibredb.el.git";)
+             (url "https://github.com/chenyanming/calibredb.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -20771,7 +20771,7 @@ programs, such as @command{ssh} and @command{scp}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/oitofelix/tramp-auto-auth.git";)
+               (url "https://github.com/oitofelix/tramp-auto-auth";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -20967,7 +20967,7 @@ It is a fork of https://github.com/cofi/evil-numbers, 
which is unmaintained.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/nschum/rotate-text.el.git";)
+                    (url "https://github.com/nschum/rotate-text.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -21016,7 +21016,7 @@ context, carry out the appropriate action.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/luxbock/evil-cleverparens.git";)
+                      (url "https://github.com/luxbock/evil-cleverparens";)
                       (commit commit)))
                 (sha256 (base32 
"0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw"))
                 (file-name (git-file-name name version))))
@@ -21043,7 +21043,7 @@ corresponding Evil keys.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/mamapanda/evil-traces.git";)
+                      (url "https://github.com/mamapanda/evil-traces";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -21125,7 +21125,7 @@ work.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/atomontage/xterm-color.git";)
+                    (url "https://github.com/atomontage/xterm-color";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -21146,7 +21146,7 @@ text-property translator.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/weirdNox/org-noter.git";)
+              (url "https://github.com/weirdNox/org-noter";)
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -21172,7 +21172,7 @@ acting like notes that are made @emph{in} the 
document.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/gongo/org-redmine.git";)
+                      (url "https://github.com/gongo/org-redmine";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -21195,7 +21195,7 @@ acting like notes that are made @emph{in} the 
document.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/manateelazycat/multi-term.git";)
+               (url "https://github.com/manateelazycat/multi-term";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21286,7 +21286,7 @@ An optional mode-line format can be enabled with 
@code{zerodark-setup-modeline-f
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hexmode/gnus-alias.git";)
+                    (url "https://github.com/hexmode/gnus-alias";)
                     (commit "9447d3ccb4c0e75d0468899cccff7aa249657bac")))
               (file-name (git-file-name name version))
               (sha256
@@ -21316,7 +21316,7 @@ message.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ofosos/ox-epub.git";)
+                    (url "https://github.com/ofosos/ox-epub";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -21340,7 +21340,7 @@ zip utility (default is @code{zip}).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kaushalmodi/ox-hugo.git";)
+             (url "https://github.com/kaushalmodi/ox-hugo";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -21362,7 +21362,7 @@ format.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kawabata/ox-pandoc.git";)
+                    (url "https://github.com/kawabata/ox-pandoc";)
                     (commit "aa37dc7e94213d4ebedb85c384c1ba35007da18e")))
               (file-name (git-file-name name version))
               (sha256
@@ -21387,7 +21387,7 @@ files to numerous other formats via Pandoc.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bnbeckwith/wc-mode.git";)
+                    (url "https://github.com/bnbeckwith/wc-mode";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -21411,7 +21411,7 @@ time.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jdenen/mastodon.el.git";)
+                    (url "https://github.com/jdenen/mastodon.el";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -21463,7 +21463,7 @@ Lisp's (relatively new) EIEIO object oriented 
libraries.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Wilfred/emacs-refactor.git";)
+                    (url "https://github.com/Wilfred/emacs-refactor";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -21491,7 +21491,7 @@ a variety of languages, including elisp itself.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/d12frosted/flyspell-correct.git";)
+             (url "https://github.com/d12frosted/flyspell-correct";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -21549,7 +21549,7 @@ contains a track position, playback will start at the 
specified position.")
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/ahungry/org-jira.git";)
+           (url "https://github.com/ahungry/org-jira";)
            (commit version)))
      (file-name (git-file-name name version))
      (sha256
@@ -21575,7 +21575,7 @@ JIRA issue servers.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/holomorph/systemd-mode.git";)
+                    (url "https://github.com/holomorph/systemd-mode";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -21601,7 +21601,7 @@ JIRA issue servers.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/jhgorrell/ssh-config-mode-el.git";)
+           (url "https://github.com/jhgorrell/ssh-config-mode-el";)
            (commit commit)))
          (file-name (git-file-name name commit))
          (sha256
@@ -21625,7 +21625,7 @@ keybindings for skipping from host section to host 
section.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/magit/ssh-agency.git";)
+                    (url "https://github.com/magit/ssh-agency";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -21656,7 +21656,7 @@ passphrase until the first time you push to a remote.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/11111000000/tao-theme-emacs.git";)
+               (url "https://github.com/11111000000/tao-theme-emacs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21685,7 +21685,7 @@ You can customize: @code{tao-theme-scale-fn}, that 
returns 16 2-digit numbers;
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cryon/almost-mono-themes.git";)
+               (url "https://github.com/cryon/almost-mono-themes";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21709,7 +21709,7 @@ You can customize: @code{tao-theme-scale-fn}, that 
returns 16 2-digit numbers;
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/lbolla/emacs-quasi-monochrome.git";)
+               (url "https://github.com/lbolla/emacs-quasi-monochrome";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21733,7 +21733,7 @@ contrast and few colors.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/hlissner/emacs-doom-themes.git";)
+                      (url "https://github.com/hlissner/emacs-doom-themes";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -21844,7 +21844,7 @@ standard.  This is the highest standard of its kind.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/wasamasa/punpun-theme.git";)
+               (url "https://github.com/wasamasa/punpun-theme";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21868,7 +21868,7 @@ color.  Designed for 256-color terminals.  Comes in 
light and dark!")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/nashamri/spacemacs-theme.git";)
+               (url "https://github.com/nashamri/spacemacs-theme";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -21891,7 +21891,7 @@ and it should work well with 256 color terminals.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/elixir-editors/emacs-elixir.git";)
+             (url "https://github.com/elixir-editors/emacs-elixir";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -21915,7 +21915,7 @@ and it should work well with 256 color terminals.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gonewest818/dimmer.el.git";)
+             (url "https://github.com/gonewest818/dimmer.el";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -22124,7 +22124,7 @@ fish-completion.  It can be used in both Eshell and M-x 
shell.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/zevlg/telega.el.git";)
+               (url "https://github.com/zevlg/telega.el";)
                (commit commit)))
          (sha256
           (base32
@@ -22242,7 +22242,7 @@ Telegram messaging platform.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/seagle0128/doom-modeline.git";)
+                    (url "https://github.com/seagle0128/doom-modeline";)
                     (commit (string-append "v" version))))
               (sha256
                (base32
@@ -22296,7 +22296,7 @@ Fish-style truncated directories in eshell and various 
modelines.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rlister/org-present.git";)
+               (url "https://github.com/rlister/org-present";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22319,7 +22319,7 @@ each slide with left/right keys.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tomterl/fullframe.git";)
+             (url "https://github.com/tomterl/fullframe";)
              (commit version)))
        (sha256
         (base32
@@ -22342,7 +22342,7 @@ execution of buffer-exposing commands.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/4DA/eshell-toggle.git";)
+               (url "https://github.com/4DA/eshell-toggle";)
                (commit commit)))
          (sha256
           (base32
@@ -22365,7 +22365,7 @@ current buffer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tomterl/repl-toggle.git";)
+             (url "https://github.com/tomterl/repl-toggle";)
              (commit version)))
        (sha256
         (base32
@@ -22388,7 +22388,7 @@ REPL appropriate to the current major mode.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DogLooksGood/emacs-rime.git";)
+             (url "https://github.com/DogLooksGood/emacs-rime";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -22437,7 +22437,7 @@ REPL appropriate to the current major mode.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/raxod502/blackout.git";)
+               (url "https://github.com/raxod502/blackout";)
                (commit commit)))
          (sha256
           (base32
@@ -22460,7 +22460,7 @@ display of major and minor modes in the mode line.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/akirak/ivy-omni-org.git";)
+               (url "https://github.com/akirak/ivy-omni-org";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22485,7 +22485,7 @@ interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tumashu/ivy-posframe.git";)
+               (url "https://github.com/tumashu/ivy-posframe";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22512,7 +22512,7 @@ posframe to show its candidate menu.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/wasamasa/shackle.git";)
+               (url "https://github.com/wasamasa/shackle";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22535,7 +22535,7 @@ can specify how popup-displaying functions occupy the 
screen.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacs-helm/helm-lacarte.git";)
+               (url "https://github.com/emacs-helm/helm-lacarte";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22562,7 +22562,7 @@ items.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tom-tan/esh-help.git";)
+               (url "https://github.com/tom-tan/esh-help";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22587,7 +22587,7 @@ by @code{zsh} as well as @code{eldoc} support.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Dewdrops/isearch-dabbrev.git";)
+               (url "https://github.com/Dewdrops/isearch-dabbrev";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22610,7 +22610,7 @@ within @code{isearch-mode}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Akirak/helm-linux-disks.git";)
+               (url "https://github.com/Akirak/helm-linux-disks";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22635,7 +22635,7 @@ on removable volumes in Linux.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/thierryvolpiatto/psession.git";)
+               (url "https://github.com/thierryvolpiatto/psession";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22658,7 +22658,7 @@ data, including buffers, window configuration, 
variables, and more.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure-emacs/parseedn.git";)
+             (url "https://github.com/clojure-emacs/parseedn";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -22683,7 +22683,7 @@ It uses parseclj's shift-reduce parser internally.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clojure-emacs/parseclj.git";)
+             (url "https://github.com/clojure-emacs/parseclj";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -22706,7 +22706,7 @@ same shift-reduce parser function.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/hlissner/emacs-hide-mode-line.git";)
+                    (url "https://github.com/hlissner/emacs-hide-mode-line";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -22890,7 +22890,7 @@ Wordnet.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ahungry/metal-mercury-mode.git";)
+               (url "https://github.com/ahungry/metal-mercury-mode";)
                (commit commit)))
          (sha256
           (base32
@@ -22917,7 +22917,7 @@ mercury-mode provided by Emacs as a wrapper around 
prolog-mode.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/davep/boxquote.el.git";)
+               (url "https://github.com/davep/boxquote.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -22939,7 +22939,7 @@ example code.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lukhas/buffer-move.git";)
+             (url "https://github.com/lukhas/buffer-move";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -22987,7 +22987,7 @@ by Jan Tatarik.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/alezost/mwim.el.git";)
+               (url "https://github.com/alezost/mwim.el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23031,7 +23031,7 @@ mode-line text (lighter) of major and minor modes.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/EricCrosson/unkillable-scratch.git";)
+               (url "https://github.com/EricCrosson/unkillable-scratch";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23051,7 +23051,7 @@ matching a given regexp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/10sr/switch-buffer-functions-el.git";)
+             (url "https://github.com/10sr/switch-buffer-functions-el";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -23099,7 +23099,7 @@ to emulate @code{scrolltobottom} while 
@code{keep-place} is enabled.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/lujun9972/el-dmenu.git";)
+               (url "https://github.com/lujun9972/el-dmenu";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23120,7 +23120,7 @@ launching other commands/applications from within 
Emacs, similar to the
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emacscollective/no-littering.git";)
+             (url "https://github.com/emacscollective/no-littering";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -23144,7 +23144,7 @@ files and subdirectories when appropriate.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wentasah/meson-mode.git";)
+             (url "https://github.com/wentasah/meson-mode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -23169,7 +23169,7 @@ cases where it breaks.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emacsmirror/message-x.git";)
+               (url "https://github.com/emacsmirror/message-x";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23221,7 +23221,7 @@ fontifications.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jwiegley/gnus-harvest.git";)
+               (url "https://github.com/jwiegley/gnus-harvest";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23407,7 +23407,7 @@ Files} (@url{http://tools.ietf.org/html/rfc4180}).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bastibe/org-journal.git";)
+             (url "https://github.com/bastibe/org-journal";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -23562,7 +23562,7 @@ snippets for Emacs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jethrokuan/org-roam.git";)
+             (url "https://github.com/jethrokuan/org-roam";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -23596,7 +23596,7 @@ personal wiki.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ianxm/emacs-uml.git";)
+               (url "https://github.com/ianxm/emacs-uml";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -23691,7 +23691,7 @@ or region and use of locally installed binaries.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/kyagi/shell-pop-el.git";)
+               (url "https://github.com/kyagi/shell-pop-el";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 9be1065..e3a9017 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -596,7 +596,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
       (source (origin (inherit (package-source xbinutils))
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/parallaxinc/propgcc.git";)
+                      (url "https://github.com/parallaxinc/propgcc";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -632,7 +632,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/totalspectrum/gcc-propeller.git";)
+                      (url "https://github.com/totalspectrum/gcc-propeller";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -667,7 +667,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/parallaxinc/propgcc.git";)
+                      (url "https://github.com/parallaxinc/propgcc";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -709,7 +709,7 @@ with a layered architecture of JTAG interface and TAP 
support.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/parallaxinc/propgcc.git";)
+                      (url "https://github.com/parallaxinc/propgcc";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -828,7 +828,7 @@ code.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/parallaxinc/propgcc.git";)
+                      (url "https://github.com/parallaxinc/propgcc";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -913,7 +913,7 @@ larger).")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/parallaxinc/spinsim.git";)
+                      (url "https://github.com/parallaxinc/spinsim";)
                       (commit commit)))
                 (file-name (string-append name "-" commit "-checkout"))
                 (sha256
@@ -969,7 +969,7 @@ simulator.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/puppeh/binutils-vc4.git";)
+                       (url "https://github.com/puppeh/binutils-vc4";)
                        (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -997,7 +997,7 @@ simulator.")
           ,(origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/puppeh/cgen.git";)
+                       (url "https://github.com/puppeh/cgen";)
                        (commit "d8e2a9eb70425f180fdd5bfd032884b0855f2032")))
                 (sha256
                  (base32
@@ -1021,7 +1021,7 @@ the Raspberry Pi chip.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/puppeh/gcc-vc4.git";)
+                      (url "https://github.com/puppeh/gcc-vc4";)
                       (commit commit)))
                 (file-name (string-append name
                                           "-"
@@ -1045,7 +1045,7 @@ the Raspberry Pi chip."))))
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/daym/libmpsse.git";)
+              (url "https://github.com/daym/libmpsse";)
               (commit (string-append "v" version))))
         (file-name "libmpsse-checkout")
         (sha256
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 35f236d..3d1fb6c 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -140,7 +140,7 @@
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dolphin-emu/dolphin.git";)
+               (url "https://github.com/dolphin-emu/dolphin";)
                (commit commit)))
          (file-name (git-file-name name version))
          (modules '((guix build utils)))
@@ -289,7 +289,7 @@ older games.")
       (source (origin
                 (method git-fetch) ; no tarball available
                 (uri (git-reference
-                      (url "https://github.com/Aloshi/EmulationStation.git";)
+                      (url "https://github.com/Aloshi/EmulationStation";)
                       (commit commit))) ; no version tag
                 (file-name (git-file-name name version))
                 (sha256
@@ -323,7 +323,7 @@ and a game metadata scraper.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/higan-emu/higan.git";)
+             (url "https://github.com/higan-emu/higan";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -484,7 +484,7 @@ The following systems are supported:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mgba-emu/mgba.git";)
+             (url "https://github.com/mgba-emu/mgba";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -540,7 +540,7 @@ and Game Boy Color games.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/LIJI32/SameBoy.git";)
+             (url "https://github.com/LIJI32/SameBoy";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -587,7 +587,7 @@ from an emulator---from save states to scaling filters.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-core.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-core";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -636,7 +636,7 @@ core library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-audio-sdl.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-audio-sdl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -682,7 +682,7 @@ SDL audio plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-input-sdl.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-input-sdl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -727,7 +727,7 @@ SDL input plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-rsp-hle.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-rsp-hle";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -769,7 +769,7 @@ high-level emulation (HLE) RSP processor plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-rsp-z64.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-rsp-z64";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -811,7 +811,7 @@ Z64 RSP processor plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url 
"https://github.com/mupen64plus/mupen64plus-video-arachnoid.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-video-arachnoid";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -857,7 +857,7 @@ Arachnoid video plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url 
"https://github.com/mupen64plus/mupen64plus-video-glide64.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-video-glide64";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -911,7 +911,7 @@ Glide64 video plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url 
"https://github.com/mupen64plus/mupen64plus-video-glide64mk2.git";)
+             (url 
"https://github.com/mupen64plus/mupen64plus-video-glide64mk2";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -961,7 +961,7 @@ Glide64MK2 video plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-video-rice.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-video-rice";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1009,7 +1009,7 @@ Rice Video plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-video-z64.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-video-z64";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1064,7 +1064,7 @@ Z64 video plugin.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mupen64plus/mupen64plus-ui-console.git";)
+             (url "https://github.com/mupen64plus/mupen64plus-ui-console";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1129,7 +1129,7 @@ towards a working Mupen64Plus for casual users.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rdanbrook/nestopia.git";)
+             (url "https://github.com/rdanbrook/nestopia";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1180,7 +1180,7 @@ emulation community.  It provides highly accurate 
emulation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libretro/RetroArch.git";)
+             (url "https://github.com/libretro/RetroArch";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1344,7 +1344,7 @@ play them on systems for which they were never designed!")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mamedev/mame.git";)
+             (url "https://github.com/mamedev/mame";)
              (commit (apply string-append "mame" (string-split version #\.)))))
        (file-name (git-file-name name version))
        (sha256
@@ -1849,7 +1849,7 @@ framework based on QEMU.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hrydgard/ppsspp.git";)
+             (url "https://github.com/hrydgard/ppsspp";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "02yx1w0ygclnmdl0imsvgj24lkzi55wvxkf47q617j0jgrqhy8yl"))
@@ -1949,7 +1949,7 @@ framework based on QEMU.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/hrydgard/ppsspp-lang.git";)
+                 (url "https://github.com/hrydgard/ppsspp-lang";)
                  (commit "d184ba2b607a03435be579406b816c90add334e6")))
            (sha256
             (base32 "0s003x6247nx09qd6a1jz1l2hsk5d6k1zmh8mg3m6hjjhvbvd9j9"))))
@@ -1957,7 +1957,7 @@ framework based on QEMU.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/hrydgard/pspautotests.git";)
+                 (url "https://github.com/hrydgard/pspautotests";)
                  (commit "328b839c7243e7f733f9eae88d059485e3d808e7")))
            (sha256
             (base32 
"1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm"))))))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f2d32e6..5262b29 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -606,7 +606,7 @@ multipole-accelerated algorithm.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/fritzing/fritzing-app.git";)
+                    (url "https://github.com/fritzing/fritzing-app";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -655,7 +655,7 @@ multipole-accelerated algorithm.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/fritzing/fritzing-parts.git";)
+                 (url "https://github.com/fritzing/fritzing-parts";)
                  (commit version)))
            (file-name (git-file-name "fritzing-parts" version))
            (sha256
@@ -713,7 +713,7 @@ as well as pick-place files.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/erichVK5/translate2geda.git";)
+                      (url "https://github.com/erichVK5/translate2geda";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -933,7 +933,7 @@ translations for KiCad.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/KiCad/kicad-symbols.git";)
+                    (url "https://github.com/KiCad/kicad-symbols";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -962,7 +962,7 @@ libraries.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/KiCad/kicad-footprints.git";)
+                    (url "https://github.com/KiCad/kicad-footprints";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -979,7 +979,7 @@ libraries.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/KiCad/kicad-packages3d.git";)
+                    (url "https://github.com/KiCad/kicad-packages3d";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -996,7 +996,7 @@ libraries.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/KiCad/kicad-templates.git";)
+                    (url "https://github.com/KiCad/kicad-templates";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2109,7 +2109,7 @@ editors.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/markwal/GPX.git";)
+                    (url "https://github.com/markwal/GPX";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2230,7 +2230,7 @@ engineers for reverse engineers.")
     (source
      (origin
       (method git-fetch)
-      (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf.git";)
+      (uri (git-reference (url "https://github.com/3MFConsortium/lib3mf";)
                           (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -2335,7 +2335,7 @@ full programmatic control over your models.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FreeCAD/FreeCAD.git";)
+             (url "https://github.com/FreeCAD/FreeCAD";)
              (commit version)))
        (modules '((guix build utils)))
        (snippet
@@ -2478,7 +2478,7 @@ interpolation toolkit.")
       (source
        (origin
          (method git-fetch)
-         (uri (git-reference (url "https://github.com/Heeks/libarea.git";)
+         (uri (git-reference (url "https://github.com/Heeks/libarea";)
                              (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2519,7 +2519,7 @@ operations.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/FreeSpacenav/libspnav.git";)
+                    (url "https://github.com/FreeSpacenav/libspnav";)
                     (commit (string-append "libspnav-" version))))
               (sha256
                (base32
diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm
index 4b6c0cf..93569f3 100644
--- a/gnu/packages/erlang.scm
+++ b/gnu/packages/erlang.scm
@@ -47,7 +47,7 @@
               ;; pre-compiled files, so we use this snapshot of the source
               ;; repository.
               (uri (git-reference
-                    (url "https://github.com/erlang/otp.git";)
+                    (url "https://github.com/erlang/otp";)
                     (commit (string-append "OTP-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/fabric-management.scm 
b/gnu/packages/fabric-management.scm
index c31ee6e..0e8b388 100644
--- a/gnu/packages/fabric-management.scm
+++ b/gnu/packages/fabric-management.scm
@@ -185,7 +185,7 @@ testing InfiniBand networks.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/openucx/ucx.git";)
+                    (url "https://github.com/openucx/ucx";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index f986acc..9236d34 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -147,7 +147,7 @@ large and/or frequently changing (network) environment.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/fdupoux/fsarchiver.git";)
+         (url "https://github.com/fdupoux/fsarchiver";)
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -574,7 +574,7 @@ All of this is accomplished without a centralized metadata 
server.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sahlberg/libnfs.git";)
+                    (url "https://github.com/sahlberg/libnfs";)
                     (commit (string-append "libnfs-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -821,7 +821,7 @@ is similar to mhddfs, unionfs, and aufs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/trapexit/mergerfs-tools.git";)
+               (url "https://github.com/trapexit/mergerfs-tools";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index edace82..dc825ef 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -206,7 +206,7 @@ and dynamically with report tools based on filtering and 
graphical charts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ledger/ledger.git";)
+             (url "https://github.com/ledger/ledger";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -304,7 +304,7 @@ in ability, and easy to use.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ledger/ledger-mode.git";)
+               (url "https://github.com/ledger/ledger-mode";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -378,7 +378,7 @@ This package provides the Emacs mode.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stesie/geierlein.git";)
+             (url "https://github.com/stesie/geierlein";)
              (commit (string-append "V" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -481,7 +481,7 @@ other machines/servers.  Electrum does not download the 
Bitcoin blockchain.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Electron-Cash/Electron-Cash.git";)
+             (url "https://github.com/Electron-Cash/Electron-Cash";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -553,7 +553,7 @@ other machines/servers.  Electroncash does not download the 
Bitcoin Cash blockch
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/monero-project/monero.git";)
+             (url "https://github.com/monero-project/monero";)
              (commit (string-append "v" version))
              (recursive? #t)))
        (file-name (git-file-name name version))
@@ -672,7 +672,7 @@ the Monero command line client and daemon.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/monero-project/monero-gui.git";)
+             (url "https://github.com/monero-project/monero-gui";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -787,7 +787,7 @@ the Monero GUI client.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/romanz/trezor-agent.git";)
+             (url "https://github.com/romanz/trezor-agent";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1197,7 +1197,7 @@ information.")
          (origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/trezor/trezor-common.git";)
+                 (url "https://github.com/trezor/trezor-common";)
                  (commit commit)))
            (sha256
             (base32
@@ -1222,7 +1222,7 @@ trezord as a regular user instead of needing to it run as 
root.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/trezor/trezord-go.git";)
+              (url "https://github.com/trezor/trezord-go";)
               (commit (string-append "v" version))))
        (sha256
         (base32
@@ -1405,7 +1405,7 @@ entity management.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited.git";)
+             (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited";)
              (commit (string-append "BCHunlimited" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 91136ab..15a6725 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -50,7 +50,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/qca/open-ath9k-htc-firmware.git";)
+                    (url "https://github.com/qca/open-ath9k-htc-firmware";)
                     (commit version)))
               (sha256
                (base32
@@ -197,7 +197,7 @@ by the b43-open driver of Linux-libre.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/riscv/opensbi.git";)
+             (url "https://github.com/riscv/opensbi";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 8e36da2..ed84443 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -98,7 +98,7 @@ programmer devices.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pali/0xffff.git";)
+             (url "https://github.com/pali/0xffff";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -216,7 +216,7 @@ firmware from it.")
        (origin
          (method git-fetch)
          (uri (git-reference
-                (url "https://github.com/PaulStoffregen/teensy_loader_cli.git";)
+                (url "https://github.com/PaulStoffregen/teensy_loader_cli";)
                 (commit commit)))
          (sha256 (base32 
"0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx"))
          (file-name (git-file-name name version))
@@ -266,7 +266,7 @@ non-root users.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                (url "https://github.com/linux-rockchip/rkflashtool.git";)
+                (url "https://github.com/linux-rockchip/rkflashtool";)
                 (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -345,7 +345,7 @@ referred to as the \"Odin 3 protocol\".")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/coreboot/coreboot.git";)
+                    (url "https://github.com/coreboot/coreboot";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -419,7 +419,7 @@ Management Engine (ME).  You need to @code{sudo rmmod 
mei_me} and
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/corna/me_cleaner.git";)
+                     (url "https://github.com/corna/me_cleaner";)
                      (commit (string-append "v" version))))
               (sha256
                (base32
@@ -451,7 +451,7 @@ ME as far as possible (it only edits ME firmware image 
files).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/LongSoft/UEFITool.git";)
+                     (url "https://github.com/LongSoft/UEFITool";)
                      (commit version)))
               (sha256
                (base32
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index e8ce8a2..0004886 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -461,7 +461,7 @@ for long periods of working with computers (8 or more hours 
per day).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/adobe-fonts/source-han-sans.git";)
+                     (url "https://github.com/adobe-fonts/source-han-sans";)
                      (commit (string-append version "R"))))
               (file-name (git-file-name name version))
               (sha256
@@ -847,7 +847,7 @@ It contains the following fonts and styles:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/belluzj/fantasque-sans.git";)
+             (url "https://github.com/belluzj/fantasque-sans";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -930,7 +930,7 @@ Powerline support.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/adobe-fonts/source-code-pro.git";)
+             (url "https://github.com/adobe-fonts/source-code-pro";)
              (commit (regexp-substitute/global
                       ;; The upstream tag uses "/" between the roman and italic
                       ;; versions, so substitute our "-" separator here.
@@ -955,7 +955,7 @@ designed to work well in user interface environments.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/adobe-fonts/source-sans-pro.git";)
+             (url "https://github.com/adobe-fonts/source-sans-pro";)
              (commit (regexp-substitute/global
                       ;; The upstream tag uses "/" between the roman and italic
                       ;; versions, so substitute our "-" separator here.
@@ -980,7 +980,7 @@ work well in user interface (UI) environments.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/adobe-fonts/source-serif-pro.git";)
+             (url "https://github.com/adobe-fonts/source-serif-pro";)
              (commit (regexp-substitute/global
                       ;; The upstream tag uses "/" between the roman and italic
                       ;; versions, so substitute our "-" separator here.
@@ -1023,7 +1023,7 @@ Sans Pro family.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/mozilla/Fira.git";)
+                     (url "https://github.com/mozilla/Fira";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1068,7 +1068,7 @@ correct spacing.")
    (source (origin
             (method git-fetch)
             (uri (git-reference
-                   (url "https://github.com/FortAwesome/Font-Awesome.git";)
+                   (url "https://github.com/FortAwesome/Font-Awesome";)
                    (commit (string-append "v" version))))
             (file-name (git-file-name name version))
             (sha256
@@ -1105,7 +1105,7 @@ vector graphics.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/sunaku/tamzen-font.git";)
+              (url "https://github.com/sunaku/tamzen-font";)
               (commit (string-append "Tamzen-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1388,7 +1388,7 @@ monospace, slab-serif fonts.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url 
"https://github.com/google/material-design-icons.git";)
+                     (url "https://github.com/google/material-design-icons";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1658,7 +1658,7 @@ formatting.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/uswds/public-sans.git";)
+             (url "https://github.com/uswds/public-sans";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 3336a84..4627930 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -177,7 +177,7 @@ Converts WOFF fonts to OpenType fonts
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wget/ttf2eot.git";)
+             (url "https://github.com/wget/ttf2eot";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -266,7 +266,7 @@ work with most software requiring Type 1 fonts.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/google/woff2.git";)
+                    (url "https://github.com/google/woff2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version ".git"))
               (sha256
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index fda5de6..b2717d2 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -127,7 +127,7 @@ For synthesis, the compiler generates netlists in the 
desired format.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/cliffordwolf/yosys.git";)
+                    (url "https://github.com/cliffordwolf/yosys";)
                     (commit (string-append "yosys-" version))
                     (recursive? #t))) ; for the ‘iverilog’ submodule
               (sha256
@@ -223,7 +223,7 @@ For synthesis, the compiler generates netlists in the 
desired format.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/cliffordwolf/icestorm.git";)
+                     (url "https://github.com/cliffordwolf/icestorm";)
                      (commit commit)))
               (file-name (git-file-name name version))
               (sha256
@@ -304,7 +304,7 @@ FOSS FPGA place and route tool.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/YosysHQ/arachne-pnr.git";)
+                     (url "https://github.com/YosysHQ/arachne-pnr";)
                      (commit commit)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/game-development.scm 
b/gnu/packages/game-development.scm
index 8711899..e45980e 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -456,7 +456,7 @@ support.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bjorn/tiled.git";)
+                    (url "https://github.com/bjorn/tiled";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -503,7 +503,7 @@ clone.")
               ;; http://mirror0.sfml-dev.org/files/ because files there seem
               ;; to be changed in place.
               (uri (git-reference
-                    (url "https://github.com/SFML/SFML.git";)
+                    (url "https://github.com/SFML/SFML";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -593,7 +593,7 @@ sounds from presets such as \"explosion\" or \"powerup\".")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alemart/surgescript.git";)
+             (url "https://github.com/alemart/surgescript";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1403,7 +1403,7 @@ painted with a mouse.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wgois/OIS.git";)
+             (url "https://github.com/wgois/OIS";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1933,7 +1933,7 @@ of the others")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ioquake/ioq3.git";)
+               (url "https://github.com/ioquake/ioq3";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2051,7 +2051,7 @@ double-buffering.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/FNA-XNA/FNA.git";)
+             (url "https://github.com/FNA-XNA/FNA";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2103,7 +2103,7 @@ focuses solely on developing a fully accurate XNA4 
runtime for the desktop.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/danfis/libccd.git";)
+             (url "https://github.com/danfis/libccd";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2179,7 +2179,7 @@ computer games, 3D authoring tools and simulation tools.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/slembcke/Chipmunk2D.git";)
+             (url "https://github.com/slembcke/Chipmunk2D";)
              (commit (string-append "Chipmunk-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2206,7 +2206,7 @@ rigid body physics library written in C.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/libtcod/libtcod.git";)
+                    (url "https://github.com/libtcod/libtcod";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5a38e20..902c3d0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -345,7 +345,7 @@ mouse and joystick control, and original music.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/carstene1ns/alex4.git";)
+             (url "https://github.com/carstene1ns/alex4";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -416,7 +416,7 @@ physics settings to tweak as well.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/viewizard/astromenace.git";)
+             (url "https://github.com/viewizard/astromenace";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -476,7 +476,7 @@ regret their insolence.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fph/bastet.git";)
+             (url "https://github.com/fph/bastet";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -655,7 +655,7 @@ high a score as possible.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/CleverRaven/Cataclysm-DDA.git";)
+             (url "https://github.com/CleverRaven/Cataclysm-DDA";)
              (commit version)))
        (sha256
         (base32 "15l6w6lxays7qmsv0ci2ry53asb9an9dh7l7fc13256k085qcg68"))
@@ -720,7 +720,7 @@ want what you have.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/CorsixTH/CorsixTH.git";)
+             (url "https://github.com/CorsixTH/CorsixTH";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -775,7 +775,7 @@ more.  This package does @emph{not} provide the game 
assets.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url 
"https://github.com/tnalpgge/rank-amateur-cowsay.git";)
+                     (url "https://github.com/tnalpgge/rank-amateur-cowsay";)
                      (commit (string-append name "-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -818,7 +818,7 @@ tired of cows, a variety of other ASCII-art messengers are 
available.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jaseg/lolcat.git";)
+               (url "https://github.com/jaseg/lolcat";)
                (commit commit)))
          (sha256
           (base32
@@ -986,7 +986,7 @@ The game features:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/freedoom/freedoom.git";)
+             (url "https://github.com/freedoom/freedoom";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1184,7 +1184,7 @@ automata.  The following features are available:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bvschaik/julius.git";)
+             (url "https://github.com/bvschaik/julius";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1291,7 +1291,7 @@ shadow mimic them to reach blocks you couldn't reach 
alone.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alemart/opensurge.git";)
+             (url "https://github.com/alemart/opensurge";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1980,7 +1980,7 @@ can be explored and changed freely.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dulsi/seahorse-adventures.git";)
+             (url "https://github.com/dulsi/seahorse-adventures";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2092,7 +2092,7 @@ and defeat them with your bubbles!")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/notapixelstudio/superstarfighter.git";)
+             (url "https://github.com/notapixelstudio/superstarfighter";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2437,7 +2437,7 @@ properly.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nevat/abbayedesmorts-gpl.git";)
+             (url "https://github.com/nevat/abbayedesmorts-gpl";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2668,7 +2668,7 @@ is very small), and shoot at the adversaries that keep 
appear on the screen.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/abishekvashok/cmatrix.git";)
+             (url "https://github.com/abishekvashok/cmatrix";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2985,7 +2985,7 @@ for common mesh file formats, and collision detection.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/thelaui/M.A.R.S..git";)
+                      (url "https://github.com/thelaui/M.A.R.S.";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -4065,7 +4065,7 @@ Transport Tycoon Deluxe.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/OpenRCT2/OpenRCT2.git";)
+             (url "https://github.com/OpenRCT2/OpenRCT2";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4273,7 +4273,7 @@ http://lavachat.symlynx.com/unix/";)
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/redeclipse/base.git";)
+               (url "https://github.com/redeclipse/base";)
                (commit (string-append "v" release))
                (recursive? #t))) ; for game data
          (file-name (git-file-name name version))
@@ -5087,7 +5087,7 @@ Linux / Mac OS X servers, and an auto mapper with a VT100 
map display.")
     (source
      (origin (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/sgimenez/laby.git";)
+                    (url "https://github.com/sgimenez/laby";)
                     (commit (string-append name "-" version))))
              (file-name (git-file-name name version))
              (sha256
@@ -5430,7 +5430,7 @@ into the Space Age.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bartobri/no-more-secrets.git";)
+             (url "https://github.com/bartobri/no-more-secrets";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5545,7 +5545,7 @@ Magic, Egypt, Indians, Norsemen, Persian or Romans.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/freegish/freegish.git";)
+                      (url "https://github.com/freegish/freegish";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -5602,7 +5602,7 @@ emerges from a sewer hole and pulls her below ground.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cxong/cdogs-sdl.git";)
+             (url "https://github.com/cxong/cdogs-sdl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5739,7 +5739,7 @@ small robot living in the nano world, repair its maker.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/teeworlds/teeworlds.git";)
+                    (url "https://github.com/teeworlds/teeworlds";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -6581,7 +6581,7 @@ some graphical niceities, and numerous bug-fixes and 
other improvements.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Novum/vkQuake.git";)
+             (url "https://github.com/Novum/vkQuake";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6716,7 +6716,7 @@ making Yamagi Quake II one of the most solid Quake II 
implementations available.
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/the-butterfly-effect/tbe.git";)
+              (url "https://github.com/the-butterfly-effect/tbe";)
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6768,7 +6768,7 @@ elements to achieve a simple goal in the most complex way 
possible.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pioneerspacesim/pioneer.git";)
+                    (url "https://github.com/pioneerspacesim/pioneer";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -6815,7 +6815,7 @@ whatever you make of it.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/umayr/badass.git";)
+                     (url "https://github.com/umayr/badass";)
                      (commit commit)))
               (file-name (git-file-name name version))
               (sha256
@@ -6840,7 +6840,7 @@ Github or Gitlab.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/colobot/colobot.git";)
+             (url "https://github.com/colobot/colobot";)
              (commit (string-append "colobot-gold-" version))
              (recursive? #t)))          ;for "data/" subdir
        (file-name (git-file-name name version))
@@ -6915,7 +6915,7 @@ You can save humanity and get programming skills!")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/coelckers/gzdoom.git";)
+             (url "https://github.com/coelckers/gzdoom";)
              (commit (string-append "g" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7077,7 +7077,7 @@ affect gameplay).")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/fabiangreffrath/crispy-doom.git";)
+                    (url "https://github.com/fabiangreffrath/crispy-doom";)
                     (commit (string-append "crispy-doom-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -7119,7 +7119,7 @@ original.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/shlomif/rinutils.git";)
+                    (url "https://github.com/shlomif/rinutils";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -7642,7 +7642,7 @@ when packaged in Blorb container files or optionally from 
individual files.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/kthakore/frozen-bubble.git";)
+               (url "https://github.com/kthakore/frozen-bubble";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7871,7 +7871,7 @@ civilized than your own.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stepmania/stepmania.git";)
+             (url "https://github.com/stepmania/stepmania";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8106,7 +8106,7 @@ and cooperative.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ryanakca/slingshot.git";)
+             (url "https://github.com/ryanakca/slingshot";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -8409,7 +8409,7 @@ fight each other on an arena-like map.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/flareteam/flare-engine.git";)
+                    (url "https://github.com/flareteam/flare-engine";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -8437,7 +8437,7 @@ action RPGs.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/flareteam/flare-game.git";)
+                    (url "https://github.com/flareteam/flare-game";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -8563,7 +8563,7 @@ Orcus Dome from evil.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/HackerPoet/MarbleMarcher.git";)
+                      (url "https://github.com/HackerPoet/MarbleMarcher";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -9501,7 +9501,7 @@ remake of that series or any other game.")
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/leela-zero/leela-zero.git";)
+           (url "https://github.com/leela-zero/leela-zero";)
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
@@ -9549,7 +9549,7 @@ can be downloaded from 
@url{https://zero.sjeng.org/best-network}.";)
    (source (origin
             (method git-fetch)
             (uri (git-reference
-                  (url "https://github.com/bernds/q5Go.git";)
+                  (url "https://github.com/bernds/q5Go";)
                   (commit (string-append "q5go-" version))))
             (file-name (git-file-name name version))
             (sha256
@@ -11165,7 +11165,7 @@ This package is part of the KDE games module.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/xmoto/xmoto.git";)
+             (url "https://github.com/xmoto/xmoto";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11257,7 +11257,7 @@ the more difficult challenges.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fbergo/eboard.git";)
+             (url "https://github.com/fbergo/eboard";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11359,7 +11359,7 @@ etc.  You can also play games on FICS or against an 
engine.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/official-stockfish/Stockfish.git";)
+             (url "https://github.com/official-stockfish/Stockfish";)
              (commit (string-append "sf_" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -11491,7 +11491,7 @@ kingdom.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Neverball/neverball.git";)
+               (url "https://github.com/Neverball/neverball";)
                (commit commit)))
          (sha256
           (base32
diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm
index 79b24ed..dde0fdd 100644
--- a/gnu/packages/genealogy.scm
+++ b/gnu/packages/genealogy.scm
@@ -44,7 +44,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gramps-project/gramps.git";)
+             (url "https://github.com/gramps-project/gramps";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm
index 27f55a3..7ad7100 100644
--- a/gnu/packages/genimage.scm
+++ b/gnu/packages/genimage.scm
@@ -45,7 +45,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pengutronix/genimage.git";)
+                    (url "https://github.com/pengutronix/genimage";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 0834add..879132c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -859,7 +859,7 @@ to create databases that are optimized for 
rendering/tile/map-services.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/osmcode/libosmium.git";)
+             (url "https://github.com/osmcode/libosmium";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -892,7 +892,7 @@ OpenStreetMap data.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/openstreetmap/osm2pgsql.git";)
+             (url "https://github.com/openstreetmap/osm2pgsql";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -941,7 +941,7 @@ map, geocoding with Nominatim, or general analysis.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mapbox/tippecanoe.git";)
+             (url "https://github.com/mapbox/tippecanoe";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1032,7 +1032,7 @@ map display.  Downloads map data from a number of 
websites, including
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/opengribs/XyGrib.git";)
+                     (url "https://github.com/opengribs/XyGrib";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1468,7 +1468,7 @@ using the dataset of topographical information collected 
by
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Maproom/qmapshack.git";)
+             (url "https://github.com/Maproom/qmapshack";)
              (commit (string-append "V_" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1620,7 +1620,7 @@ exchanged form one Spatial DBMS and the other.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/OpenCPN/OpenCPN.git";)
+             (url "https://github.com/OpenCPN/OpenCPN";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index c52dc7a..c2fca07 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -311,7 +311,7 @@ brushstrokes which is used by MyPaint and GIMP.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mypaint/mypaint-brushes.git";)
+             (url "https://github.com/mypaint/mypaint-brushes";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -337,7 +337,7 @@ MyPaint.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mypaint/mypaint-brushes.git";)
+             (url "https://github.com/mypaint/mypaint-brushes";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index d7a6082..fb33bd7 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -193,7 +193,7 @@ Polygon meshes, and Extruded polygon meshes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/divVerent/s2tc.git";)
+             (url "https://github.com/divVerent/s2tc";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -833,7 +833,7 @@ and surfaces, receiving input and events.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/extemporelang/nanovg.git";)
+                      (url "https://github.com/extemporelang/nanovg";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -893,7 +893,7 @@ mixed vector/bitmap output.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/VirtualGL/virtualgl.git";)
+             (url "https://github.com/VirtualGL/virtualgl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 53be103..83e0fc7 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -98,7 +98,7 @@ like Gnome, Unity, Budgie, Pantheon, XFCE, Mate and others.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/madmaxms/iconpack-delft.git";)
+             (url "https://github.com/madmaxms/iconpack-delft";)
              (commit (string-append "v" version))))
        (sha256
         (base32
@@ -244,7 +244,7 @@ easier to keep track of apps running in the backround.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/micheleg/dash-to-dock.git";)
+                    (url "https://github.com/micheleg/dash-to-dock";)
                     (commit (string-append "extensions.gnome.org-v"
                                            version))))
               (sha256
@@ -423,7 +423,7 @@ currently focused application in the top panel of the GNOME 
shell.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/home-sweet-gnome/dash-to-panel.git";)
+                    (url "https://github.com/home-sweet-gnome/dash-to-panel";)
                     (commit (string-append "v" version))))
               (sha256
                (base32
@@ -462,7 +462,7 @@ into a single panel, similar to that found in KDE Plasma 
and Windows 7+.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/BjoernDaase/noannoyance.git";)
+                    (url "https://github.com/BjoernDaase/noannoyance";)
                     (commit "e37b5b3c31f577b4698bc6659bc9fec5ea9ac5d4")))
               (sha256
                (base32
@@ -485,7 +485,7 @@ It uses ES6 syntax and claims to be more actively 
maintained than others.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/paperwm/PaperWM.git";)
+                    (url "https://github.com/paperwm/PaperWM";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -522,7 +522,7 @@ notebooks and tiling window managers.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/numixproject/numix-gtk-theme.git";)
+                    (url "https://github.com/numixproject/numix-gtk-theme";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -564,7 +564,7 @@ dark elements.  It supports GNOME, Unity, Xfce, and 
Openbox.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url 
"https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git";)
+               (url 
"https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";)
                (commit tag)))
          (sha256
           (base32
@@ -597,7 +597,7 @@ and a few extra features.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/benwaffle/vala-language-server.git";)
+                    (url "https://github.com/benwaffle/vala-language-server";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2f390c6..78609b5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5384,7 +5384,7 @@ DAV, and others.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/hughsie/libgusb.git";)
+                     (url "https://github.com/hughsie/libgusb";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -8446,7 +8446,7 @@ functionality and behavior.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/NicoHood/arc-theme.git";)
+                    (url "https://github.com/NicoHood/arc-theme";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -8489,7 +8489,7 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/snwh/faba-icon-theme.git";)
+             (url "https://github.com/snwh/faba-icon-theme";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8522,7 +8522,7 @@ Moka")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/snwh/moka-icon-theme.git";)
+             (url "https://github.com/snwh/moka-icon-theme";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -8545,7 +8545,7 @@ simple and consistent.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/horst3180/arc-icon-theme.git";)
+             (url "https://github.com/horst3180/arc-icon-theme";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -9416,7 +9416,7 @@ configurable file renaming. ")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rcaelers/workrave.git";)
+             (url "https://github.com/rcaelers/workrave";)
              (commit (string-append "v" (string-map
                                          (match-lambda (#\. #\_) (chr chr))
                                          version)))))
@@ -10204,7 +10204,7 @@ card sheets that you’ll find at most office supply 
stores.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libratbag/libratbag.git";)
+             (url "https://github.com/libratbag/libratbag";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10271,7 +10271,7 @@ your operating-system definition:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libratbag/piper.git";)
+             (url "https://github.com/libratbag/piper";)
              (commit version)))
        (sha256
         (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv"))
@@ -10338,7 +10338,7 @@ provided there is a DBus service present:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gkarsay/parlatype.git";)
+               (url "https://github.com/gkarsay/parlatype";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index fa43083..5da18a2 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1465,7 +1465,7 @@ Thunderbird.  It supports email, news feeds, chat, 
calendar and contacts.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Unode/firefox_decrypt.git";)
+                    (url "https://github.com/Unode/firefox_decrypt";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 58d6b00..2c31632 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -227,7 +227,7 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/golang/go.git";)
+             (url "https://github.com/golang/go";)
              (commit (string-append "go" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -433,7 +433,7 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/alsm/ioprogress.git";)
+                       (url "https://github.com/alsm/ioprogress";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -459,7 +459,7 @@ writers can be supplied for alternate environments.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/aki237/nscjar.git";)
+                       (url "https://github.com/aki237/nscjar";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -509,7 +509,7 @@ way of specifying command line options.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/go-tomb/tomb.git";)
+                      (url "https://github.com/go-tomb/tomb";)
                       (commit commit)))
                 (file-name (string-append name "-" version ".tar.gz"))
                 (sha256
@@ -862,7 +862,7 @@ time.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/BurntSushi/toml.git";)
+             (url "https://github.com/BurntSushi/toml";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -887,7 +887,7 @@ is similar to Go's standard library @code{json} and 
@code{xml} package.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/getsentry/raven-go.git";)
+               (url "https://github.com/getsentry/raven-go";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -916,7 +916,7 @@ logging system.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/hashicorp/go-version.git";)
+               (url "https://github.com/hashicorp/go-version";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -946,7 +946,7 @@ increment versions.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jpillora/backoff.git";)
+               (url "https://github.com/jpillora/backoff";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -969,7 +969,7 @@ Go.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stretchr/objx.git";)
+             (url "https://github.com/stretchr/objx";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -992,7 +992,7 @@ slices, JSON and other data.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stretchr/testify.git";)
+             (url "https://github.com/stretchr/testify";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1031,7 +1031,7 @@ Features include:
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/tevino/abool.git";)
+                 (url "https://github.com/tevino/abool";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -1056,7 +1056,7 @@ optimized for performance yet simple to use.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/blang/semver.git";)
+               (url "https://github.com/blang/semver";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1080,7 +1080,7 @@ optimized for performance yet simple to use.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/emicklei/go-restful.git";)
+               (url "https://github.com/emicklei/go-restful";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1106,7 +1106,7 @@ with the HTTP protocol definition.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/google/cadvisor.git";)
+               (url "https://github.com/google/cadvisor";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1132,7 +1132,7 @@ containers.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/google/gofuzz.git";)
+               (url "https://github.com/google/gofuzz";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1157,7 +1157,7 @@ values for the purpose of fuzz testing.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gorilla/context.git";)
+               (url "https://github.com/gorilla/context";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1181,7 +1181,7 @@ values for the purpose of fuzz testing.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gorilla/mux.git";)
+               (url "https://github.com/gorilla/mux";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1207,7 +1207,7 @@ incoming requests with their respective handler.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/jonboulle/clockwork.git";)
+                 (url "https://github.com/jonboulle/clockwork";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -1329,7 +1329,7 @@ applications as well as a program to generate 
applications and command files.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/spf13/pflag.git";)
+               (url "https://github.com/spf13/pflag";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -1356,7 +1356,7 @@ GNU extensions} to the POSIX recommendations for 
command-line options.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/spf13/viper.git";)
+             (url "https://github.com/spf13/viper";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1493,7 +1493,7 @@ all types of configuration needs and formats.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sirupsen/logrus.git";)
+             (url "https://github.com/sirupsen/logrus";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1522,7 +1522,7 @@ compatible with the standard library logger.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rifflock/lfshook.git";)
+                    (url "https://github.com/rifflock/lfshook";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1655,7 +1655,7 @@ to interact with distribution components.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/docker/go-connections.git";)
+                 (url "https://github.com/docker/go-connections";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -1682,7 +1682,7 @@ translation (NAT), proxies, sockets, and transport layer 
security (TLS).")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/docker/machine.git";)
+               (url "https://github.com/docker/machine";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1709,7 +1709,7 @@ Docker on them, then configures the Docker client to talk 
to them.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gorhill/cronexpr.git";)
+               (url "https://github.com/gorhill/cronexpr";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2242,7 +2242,7 @@ generation features.  This code generation is used to 
achieve:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/libp2p/go-flow-metrics.git";)
+               (url "https://github.com/libp2p/go-flow-metrics";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2268,7 +2268,7 @@ that's a lot faster (and only does simple bandwidth 
metrics).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/davecgh/go-spew.git";)
+             (url "https://github.com/davecgh/go-spew";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2308,7 +2308,7 @@ style).
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/btcsuite/btclog.git";)
+               (url "https://github.com/btcsuite/btclog";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2334,7 +2334,7 @@ implementing the same interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/btcsuite/btcd.git";)
+               (url "https://github.com/btcsuite/btcd";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2370,7 +2370,7 @@ needing to use secp256k1 elliptic curve cryptography.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/minio/sha256-simd.git";)
+             (url "https://github.com/minio/sha256-simd";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2406,7 +2406,7 @@ Architecture Processors\" by J. Guilford et al.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/libp2p/go-libp2p-crypto.git";)
+               (url "https://github.com/libp2p/go-libp2p-crypto";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2436,7 +2436,7 @@ Architecture Processors\" by J. Guilford et al.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mr-tron/base58.git";)
+               (url "https://github.com/mr-tron/base58";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2463,7 +2463,7 @@ encoding and 8 times faster decoding.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gxed/hashland.git";)
+               (url "https://github.com/gxed/hashland";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2489,7 +2489,7 @@ hash algorithm.  See http://keccak.noekeon.org.";)
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/minio/blake2b-simd.git";)
+               (url "https://github.com/minio/blake2b-simd";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2519,7 +2519,7 @@ increase approaching hashing speeds of 1GB/sec on a 
single core.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/spaolacci/murmur3.git";)
+             (url "https://github.com/spaolacci/murmur3";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2545,7 +2545,7 @@ required by Go's standard Hash interface.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/twmb/murmur3.git";)
+             (url "https://github.com/twmb/murmur3";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2573,7 +2573,7 @@ required by Go's standard Hash interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/multiformats/go-multihash.git";)
+               (url "https://github.com/multiformats/go-multihash";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2604,7 +2604,7 @@ required by Go's standard Hash interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/libp2p/go-libp2p-peer.git";)
+               (url "https://github.com/libp2p/go-libp2p-peer";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2639,7 +2639,7 @@ required by Go's standard Hash interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/libp2p/go-libp2p-protocol.git";)
+               (url "https://github.com/libp2p/go-libp2p-protocol";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2664,7 +2664,7 @@ required by Go's standard Hash interface.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/libp2p/go-libp2p-metrics.git";)
+               (url "https://github.com/libp2p/go-libp2p-metrics";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2703,7 +2703,7 @@ statistics for wrapped connections.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mitchellh/go-homedir.git";)
+               (url "https://github.com/mitchellh/go-homedir";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2764,7 +2764,7 @@ cross-compilation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/multiformats/go-multiaddr.git";)
+               (url "https://github.com/multiformats/go-multiaddr";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2806,7 +2806,7 @@ does the following:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/multiformats/go-multiaddr-net.git";)
+               (url "https://github.com/multiformats/go-multiaddr-net";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2844,7 +2844,7 @@ as conversion to and from @command{net.Addr}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/whyrusleeping/tar-utils.git";)
+               (url "https://github.com/whyrusleeping/tar-utils";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2869,7 +2869,7 @@ as conversion to and from @command{net.Addr}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cheekybits/is.git";)
+               (url "https://github.com/cheekybits/is";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2901,7 +2901,7 @@ as conversion to and from @command{net.Addr}.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/sabhiram/go-gitignore.git";)
+               (url "https://github.com/sabhiram/go-gitignore";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2926,7 +2926,7 @@ as conversion to and from @command{net.Addr}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/urfave/cli.git";)
+             (url "https://github.com/urfave/cli";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3055,7 +3055,7 @@ anchor names.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/whyrusleeping/json-filter.git";)
+               (url "https://github.com/whyrusleeping/json-filter";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3081,7 +3081,7 @@ anchor names.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/whyrusleeping/progmeter.git";)
+               (url "https://github.com/whyrusleeping/progmeter";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3106,7 +3106,7 @@ anchor names.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/whyrusleeping/stump.git";)
+               (url "https://github.com/whyrusleeping/stump";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3131,7 +3131,7 @@ have super fancy logs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/kr/fs.git";)
+               (url "https://github.com/kr/fs";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3178,7 +3178,7 @@ format in Go.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kr/pretty.git";)
+                    (url "https://github.com/kr/pretty";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3201,7 +3201,7 @@ format in Go.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kr/text.git";)
+                    (url "https://github.com/kr/text";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3546,7 +3546,7 @@ decode/encode structures and slices.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pkg/errors.git";)
+                    (url "https://github.com/pkg/errors";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3768,7 +3768,7 @@ can be used to build a client and/or a server.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/fatih/color.git";)
+                     (url "https://github.com/fatih/color";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3790,7 +3790,7 @@ colorized or SGR defined output to the standard output.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/google/go-cmp.git";)
+                     (url "https://github.com/google/go-cmp";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3838,7 +3838,7 @@ common task.")
   (origin
     (method git-fetch)
     (uri (git-reference
-          (url "https://github.com/gotestyourself/gotest.tools.git";)
+          (url "https://github.com/gotestyourself/gotest.tools";)
           (commit (string-append "v" version))))
     (file-name (git-file-name "go-gotest-tools" version))
     (sha256
@@ -3914,7 +3914,7 @@ test when a comparison fails.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/gotestyourself/gotestsum.git";)
+                     (url "https://github.com/gotestyourself/gotestsum";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3961,7 +3961,7 @@ test results.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/golang/protobuf.git";)
+                     (url "https://github.com/golang/protobuf";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3986,7 +3986,7 @@ data serialization format.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mattn/go-zglob.git";)
+                    (url "https://github.com/mattn/go-zglob";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index 6963da9..7345994 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -43,7 +43,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gpodder/gpodder.git";)
+             (url "https://github.com/gpodder/gpodder";)
              (commit version)))
        (sha256
         (base32
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 762ee30..93460bb 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -216,7 +216,7 @@ objects from the @code{graph} package.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/wjrl/RBioFabric.git";)
+                      (url "https://github.com/wjrl/RBioFabric";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -240,7 +240,7 @@ lines.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/plotly/plotly.py.git";)
+                    (url "https://github.com/plotly/plotly.py";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -318,7 +318,7 @@ subplots, multiple-axes, polar charts, and bubble charts. ")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vtraag/louvain-igraph.git";)
+                    (url "https://github.com/vtraag/louvain-igraph";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -351,7 +351,7 @@ not be used for new projects.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/facebookresearch/faiss.git";)
+                    (url "https://github.com/facebookresearch/faiss";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e8bff9b..5b18d14 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -160,7 +160,7 @@ objects!")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/autotrace/autotrace.git";)
+                      (url "https://github.com/autotrace/autotrace";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -301,7 +301,7 @@ application can be customized via its API for Python 
scripting.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/assimp/assimp.git";)
+                    (url "https://github.com/assimp/assimp";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -511,7 +511,7 @@ other vector formats such as:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/OGRECave/ogre.git";)
+             (url "https://github.com/OGRECave/ogre";)
              (commit (string-append "v" version))
              (recursive? #t)))          ;for Dear ImGui submodule
        (file-name (git-file-name name version))
@@ -628,7 +628,7 @@ storage of the \"EXR\" file format for storing 16-bit 
floating-point images.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/OpenImageIO/oiio.git";)
+                    (url "https://github.com/OpenImageIO/oiio";)
                     (commit (string-append "Release-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -948,7 +948,7 @@ output.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/wdas/brdf.git";)
+                      (url "https://github.com/wdas/brdf";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -1217,7 +1217,7 @@ and GPU architectures.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/floriankirsch/OpenCSG.git";)
+               (url "https://github.com/floriankirsch/OpenCSG";)
                (commit (string-append "opencsg-"
                                       (string-map dot-to-dash version)
                                       "-release"))))
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 815a35a..0f2afb9 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -211,7 +211,7 @@ visualization tool suite.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pygraphviz/pygraphviz.git";)
+             (url "https://github.com/pygraphviz/pygraphviz";)
              (commit (string-append "pygraphviz-" version))))
        (file-name (string-append "pygraphviz-" version "-checkout"))
        (sha256
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 5fe353a..ae896cf 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -177,7 +177,7 @@ is usually the formatter of \"man\" documentation pages.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/bagder/roffit.git";)
+                      (url "https://github.com/bagder/roffit";)
                       (commit commit)))
                 (file-name (string-append "roffit-" commit "-checkout"))
                 (sha256
diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm
index f5d0416..e21c4e3 100644
--- a/gnu/packages/groovy.scm
+++ b/gnu/packages/groovy.scm
@@ -36,7 +36,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/apache/groovy.git";)
+             (url "https://github.com/apache/groovy";)
              (commit (string-append
                       "GROOVY_"
                       (string-map (lambda (x) (if (eq? x #\.) #\_ x))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3cadccd..e3c0979 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1741,7 +1741,7 @@ misspelled words in a GtkTextView widget.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/CristianHenzel/ClipIt.git";)
+             (url "https://github.com/CristianHenzel/ClipIt";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1856,7 +1856,7 @@ independent of your desktop environment, and supports 
global key bindings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/v1cont/yad.git";)
+             (url "https://github.com/v1cont/yad";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 160bf63..59266a0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -234,7 +234,7 @@ more.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ijp/guildhall.git";)
+                      (url "https://github.com/ijp/guildhall";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -1350,7 +1350,7 @@ SQL databases.  This package implements the interface for 
SQLite.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/opencog/guile-dbi.git";)
+               (url "https://github.com/opencog/guile-dbi";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1850,7 +1850,7 @@ provides access to that interface and its types from the 
Scheme level.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/fisherdj/miniAdapton.git";)
+                      (url "https://github.com/fisherdj/miniAdapton";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -2047,7 +2047,7 @@ for Guile\".")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ijp/minikanren.git";)
+                    (url "https://github.com/ijp/minikanren";)
                     (commit "e844d85512f8c055d3f96143ee506007389a25e3")))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3104,7 +3104,7 @@ clean and easy to use high level API.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/lloda/guile-ffi-fftw.git";)
+                      (url "https://github.com/lloda/guile-ffi-fftw";)
                       (commit commit)))
                 (file-name (git-file-name "guile-ffi-fftw" version))
                 (sha256
@@ -3540,7 +3540,7 @@ according to Bitorrent BEP003.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/rekado/guile-irc.git";)
+                      (url "https://github.com/rekado/guile-irc";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index a32bd33..6430633 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -596,7 +596,7 @@ specification.  These are the main features:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ijp/guile-gdbm.git";)
+                    (url "https://github.com/ijp/guile-gdbm";)
                     (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246")))
               (file-name (string-append name "-" version "-checkout"))
               (patches (search-patches
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 6a2e2c6..211a5a3 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -294,7 +294,7 @@ be dangerous and may void your CPU or system board's 
warranty.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/uoaerg/wavemon.git";)
+             (url "https://github.com/uoaerg/wavemon";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -338,7 +338,7 @@ supported by the Linux kernel.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rockchip-linux/rkdeveloptool.git";)
+               (url "https://github.com/rockchip-linux/rkdeveloptool";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index 5b6f040..0197046 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -149,7 +149,7 @@ installation of Haskell libraries and programs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jameysharp/corrode.git";)
+               (url "https://github.com/jameysharp/corrode";)
                (commit "b6699fb2fa552a07c6091276285a44133e5c9789")))
          (file-name (git-file-name name version))
          (sha256
@@ -624,7 +624,7 @@ and mIRC chat codes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/david-janssen/kmonad.git";)
+             (url "https://github.com/david-janssen/kmonad";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 0508916..2387dfb 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -5129,7 +5129,7 @@ the ‘haddock’ package.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/haskell/haddock.git";)
+             (url "https://github.com/haskell/haddock";)
              (commit (string-append "haddock-" version "-release"))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm
index e1a0291..c2c6228 100644
--- a/gnu/packages/hexedit.scm
+++ b/gnu/packages/hexedit.scm
@@ -38,7 +38,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pixel/hexedit.git";)
+                    (url "https://github.com/pixel/hexedit";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm
index 0061701..537aeaf 100644
--- a/gnu/packages/i2p.scm
+++ b/gnu/packages/i2p.scm
@@ -35,7 +35,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/PurpleI2P/i2pd.git";)
+             (url "https://github.com/PurpleI2P/i2pd";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index b31d60f..b48f21b 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -305,7 +305,7 @@ Japanese language input in most graphical applications.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rime/librime.git";)
+             (url "https://github.com/rime/librime";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -356,7 +356,7 @@ traditional Chinese output.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rime/plum.git";)
+             (url "https://github.com/rime/plum";)
              (commit "397d601dd22cfc857613973724724b8f44db9f9c")))
        (file-name "plum-checkout")
        (sha256
@@ -403,7 +403,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-array.git";)
+                 (url "https://github.com/rime/rime-array";)
                  (commit "93cc99238f120606a076220ec4ddcad164f6396a")))
            (file-name "rime-array-checkout")
            (sha256
@@ -413,7 +413,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-bopomofo.git";)
+                 (url "https://github.com/rime/rime-bopomofo";)
                  (commit "ed25098386f5efd3d70b08650f0d1b70c41c11a3")))
            (file-name "rime-bopomofo-checkout")
            (sha256
@@ -423,7 +423,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-cangjie.git";)
+                 (url "https://github.com/rime/rime-cangjie";)
                  (commit "5fd8ce6f64039e505ca02655a621f2e830b97c19")))
            (file-name "rime-cangjie-checkout")
            (sha256
@@ -433,7 +433,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-cantonese.git";)
+                 (url "https://github.com/rime/rime-cantonese";)
                  (commit "e06fe8e79d7d64db2f2b6339aabc004d8cbc1f67")))
            (file-name "rime-cantonese-checkout")
            (sha256
@@ -443,7 +443,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-combo-pinyin.git";)
+                 (url "https://github.com/rime/rime-combo-pinyin";)
                  (commit "67b29cdc786928ea46b43a9c660dee3db8f1adff")))
            (file-name "rime-combo-pinyin-checkout")
            (sha256
@@ -453,7 +453,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-double-pinyin.git";)
+                 (url "https://github.com/rime/rime-double-pinyin";)
                  (commit "69bf85d4dfe8bac139c36abbd68d530b8b6622ea")))
            (file-name "rime-double-pinyin-checkout")
            (sha256
@@ -463,7 +463,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-emoji.git";)
+                 (url "https://github.com/rime/rime-emoji";)
                  (commit "c99d34e4a837349e4679a110bb4b94f71fe015ae")))
            (file-name "rime-emoji-checkout")
            (sha256
@@ -473,7 +473,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-essay.git";)
+                 (url "https://github.com/rime/rime-essay";)
                  (commit "88055afa3752e4582fa887765d962a30e02bb1fa")))
            (file-name "rime-essay-checkout")
            (sha256
@@ -483,7 +483,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-ipa.git";)
+                 (url "https://github.com/rime/rime-ipa";)
                  (commit "22b71710e029bcb412e9197192a638ab11bc2abf")))
            (file-name "rime-ipa-checkout")
            (sha256
@@ -493,7 +493,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-jyutping.git";)
+                 (url "https://github.com/rime/rime-jyutping";)
                  (commit "6fe0d727b3178feabd0f01e6cd82599202764735")))
            (file-name "rime-jyutping-checkout")
            (sha256
@@ -503,7 +503,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-luna-pinyin.git";)
+                 (url "https://github.com/rime/rime-luna-pinyin";)
                  (commit "f1268e192ca88b9526467ce04ac3e47c837891ad")))
            (file-name "rime-luna-pinyin-checkout")
            (sha256
@@ -513,7 +513,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-middle-chinese.git";)
+                 (url "https://github.com/rime/rime-middle-chinese";)
                  (commit "ed6d44f8d0bedf6e0c1c3183a270f8f01a211a40")))
            (file-name "rime-middle-chinese-checkout")
            (sha256
@@ -523,7 +523,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-pinyin-simp.git";)
+                 (url "https://github.com/rime/rime-pinyin-simp";)
                  (commit "b73df7fc0994912ce785462b3be569ae81258ac2")))
            (file-name "rime-pinyin-simp-checkout")
            (sha256
@@ -533,7 +533,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-prelude.git";)
+                 (url "https://github.com/rime/rime-prelude";)
                  (commit "8a52b4f86a59f3eb602f9a4cf6a680a67c15df8c")))
            (file-name "rime-prelude-checkout")
            (sha256
@@ -543,7 +543,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-quick.git";)
+                 (url "https://github.com/rime/rime-quick";)
                  (commit "3fe5911ba608cb2df1b6301b76ad1573bd482a76")))
            (file-name "rime-quick-checkout")
            (sha256
@@ -553,7 +553,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-scj.git";)
+                 (url "https://github.com/rime/rime-scj";)
                  (commit "cab5a0858765eff0553dd685a2d61d5536e9149c")))
            (file-name "rime-scj-checkout")
            (sha256
@@ -563,7 +563,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-soutzoe.git";)
+                 (url "https://github.com/rime/rime-soutzoe";)
                  (commit "beeaeca72d8e17dfd1e9af58680439e9012987dc")))
            (file-name "rime-soutzoe-checkout")
            (sha256
@@ -573,7 +573,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-stenotype.git";)
+                 (url "https://github.com/rime/rime-stenotype";)
                  (commit "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88")))
            (file-name "rime-stenotype-checkout")
            (sha256
@@ -583,7 +583,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-stroke.git";)
+                 (url "https://github.com/rime/rime-stroke";)
                  (commit "ea8576d1accd6fda339e96b415caadb56e2a07d1")))
            (file-name "rime-stroke-checkout")
            (sha256
@@ -593,7 +593,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-terra-pinyin.git";)
+                 (url "https://github.com/rime/rime-terra-pinyin";)
                  (commit "492aaf914f9de37cc9d26b846dc693116de70ae8")))
            (file-name "rime-terra-pinyin-checkout")
            (sha256
@@ -603,7 +603,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-wubi.git";)
+                 (url "https://github.com/rime/rime-wubi";)
                  (commit "dd052ee158a38cb791755318b1aef9b4a3ed0316")))
            (file-name "rime-wubi-checkout")
            (sha256
@@ -613,7 +613,7 @@ traditional Chinese output.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/rime/rime-wugniu.git";)
+                 (url "https://github.com/rime/rime-wugniu";)
                  (commit "abd1ee98efbf170258fcf43875c21a4259e00b61")))
            (file-name "rime-wugniu-checkout")
            (sha256
@@ -633,7 +633,7 @@ Method Engine.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rime/ibus-rime.git";)
+             (url "https://github.com/rime/ibus-rime";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index a11b1b8..ea63801 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -587,7 +587,7 @@ recalculates.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vxl/vxl.git";)
+             (url "https://github.com/vxl/vxl";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -629,7 +629,7 @@ libraries designed for computer vision research and 
implementation.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vxl/vxl.git";)
+             (url "https://github.com/vxl/vxl";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -850,7 +850,7 @@ combine the information contained in both.")
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/pyushkevich/c3d.git";)
+                   (url "https://github.com/pyushkevich/c3d";)
                    (commit commit)))
              (file-name (git-file-name "c3d" version))
              (sha256
@@ -865,7 +865,7 @@ combine the information contained in both.")
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/pyushkevich/greedy.git";)
+                   (url "https://github.com/pyushkevich/greedy";)
                    (commit commit)))
              (file-name (git-file-name "greedy" version))
              (sha256
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 8303ba3..610a3d7 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -191,7 +191,7 @@ It is the default image viewer on LXDE desktop 
environment.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/muennich/sxiv.git";)
+                    (url "https://github.com/muennich/sxiv";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -237,7 +237,7 @@ it and customize it for your needs.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/hellosiyan/Viewnior.git";)
+               (url "https://github.com/hellosiyan/Viewnior";)
                (commit (string-append name "-" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -289,7 +289,7 @@ your images.  Among its features are:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/posva/catimg.git";)
+             (url "https://github.com/posva/catimg";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -488,7 +488,7 @@ For PDF support, install the @emph{mupdf} package.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jurplel/qView.git";)
+             (url "https://github.com/jurplel/qView";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 75b24ec..3fdc6db 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -309,7 +309,7 @@ Currently all documentation resides in @file{pnglite.h}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ImageOptim/libimagequant.git";)
+             (url "https://github.com/ImageOptim/libimagequant";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -333,7 +333,7 @@ and other PNG optimizers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kornelski/pngquant.git";)
+             (url "https://github.com/kornelski/pngquant";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -589,7 +589,7 @@ collection of tools for doing simple manipulations of TIFF 
images.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DanBloomberg/leptonica.git";)
+             (url "https://github.com/DanBloomberg/leptonica";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1357,7 +1357,7 @@ convert, manipulate, filter and display a wide variety of 
image formats.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mdadams/jasper.git";)
+                    (url "https://github.com/mdadams/jasper";)
                     (commit (string-append "version-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1380,7 +1380,7 @@ ISO/IEC 15444-1).")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/sekrit-twc/zimg.git";)
+              (url "https://github.com/sekrit-twc/zimg";)
               (commit (string-append "release-" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -1408,7 +1408,7 @@ the programmer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/myint/perceptualdiff.git";)
+             (url "https://github.com/myint/perceptualdiff";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1482,7 +1482,7 @@ changed, making the embedding resistant against 
first-order statistical tests.")
       (source
        (origin (method git-fetch)
                (uri (git-reference
-                     (url "https://github.com/extemporelang/stb.git";)
+                     (url "https://github.com/extemporelang/stb";)
                      (commit commit)))
                (sha256
                 (base32
@@ -1688,7 +1688,7 @@ medical image data, e.g. magnetic resonance image (MRI) 
and functional MRI
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/thezbyg/gpick.git";)
+                    (url "https://github.com/thezbyg/gpick";)
                     (commit (string-append name "-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1751,7 +1751,7 @@ parsing, viewing, modifying, and saving this metadata.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lupoDharkael/flameshot.git";)
+             (url "https://github.com/lupoDharkael/flameshot";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1864,7 +1864,7 @@ identical visual appearance.")
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/emersion/grim.git";)
+           (url "https://github.com/emersion/grim";)
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
@@ -1890,7 +1890,7 @@ identical visual appearance.")
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/emersion/slurp.git";)
+           (url "https://github.com/emersion/slurp";)
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
      (sha256
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 15f174f..ba3c71d 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -37,7 +37,7 @@
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/ipfs/go-ipfs-cmdkit.git";)
+                 (url "https://github.com/ipfs/go-ipfs-cmdkit";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -65,7 +65,7 @@ that are shared between @command{go-ipfs/commands} and its 
rewrite
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ipfs/go-ipfs-api.git";)
+               (url "https://github.com/ipfs/go-ipfs-api";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -110,7 +110,7 @@ that are shared between @command{go-ipfs/commands} and its 
rewrite
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/whyrusleeping/gx.git";)
+             (url "https://github.com/whyrusleeping/gx";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm
index bc9972e..f7a8902 100644
--- a/gnu/packages/java-graphics.scm
+++ b/gnu/packages/java-graphics.scm
@@ -96,7 +96,7 @@ features not found in the core libraries.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bourgesl/marlin-renderer.git";)
+                    (url "https://github.com/bourgesl/marlin-renderer";)
                     (commit (string-append "v" (string-map (match-lambda
                                                              (#\. #\_)
                                                              (c c))
diff --git a/gnu/packages/java-maths.scm b/gnu/packages/java-maths.scm
index 748ae67..97343e0 100644
--- a/gnu/packages/java-maths.scm
+++ b/gnu/packages/java-maths.scm
@@ -37,7 +37,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mikiobraun/jblas.git";)
+                    (url "https://github.com/mikiobraun/jblas";)
                     (commit (string-append "jblas-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 170936a..289bdd7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2654,7 +2654,7 @@ OpenJFX distribution.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/javacc/javacc.git";)
+                    (url "https://github.com/javacc/javacc";)
                     (commit "release_41")))
               (file-name (string-append "javacc-" version "-checkout"))
               (sha256
@@ -2703,7 +2703,7 @@ debugging, etc.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/javacc/javacc.git";)
+             (url "https://github.com/javacc/javacc";)
              (commit version)))
        (file-name (git-file-name "javacc" version))
        (sha256
@@ -3329,7 +3329,7 @@ API and version 2.1 of the Java ServerPages API.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/javaee/servlet-spec.git";)
+                      (url "https://github.com/javaee/servlet-spec";)
                       (commit version)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -4598,7 +4598,7 @@ complex transformations and code analysis tools.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cglib/cglib.git";)
+             (url "https://github.com/cglib/cglib";)
              (commit (string-append
                       "RELEASE_"
                       (string-map (lambda (c) (if (char=? c #\.) #\_ c))
@@ -8984,7 +8984,7 @@ the subsequent value resolution at any given level.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/nhatminhle/cofoja.git";)
+                    (url "https://github.com/nhatminhle/cofoja";)
                     (commit (string-append "v" version))))
               (file-name (string-append "java-cofoja-" version "-checkout"))
               (sha256
@@ -9386,7 +9386,7 @@ those in Perl and JavaScript.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/cbeust/testng.git";)
+                    (url "https://github.com/cbeust/testng";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -9464,7 +9464,7 @@ to use.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/neilalexander/jnacl.git";)
+                      (url "https://github.com/neilalexander/jnacl";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -10047,7 +10047,7 @@ protocol-independent framework to build mail and 
messaging applications.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/zeromq/jeromq.git";)
+                    (url "https://github.com/zeromq/jeromq";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -10834,7 +10834,7 @@ features that bring it on par with the Z shell line 
editor.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                  (url "https://github.com/xmlunit/test-resources.git";)
+                  (url "https://github.com/xmlunit/test-resources";)
                   (commit "a590d2ae865c3e0455691d76ba8eefccc2215aec")))
            (file-name "java-xmlunit-test-resources")
            (sha256
@@ -11439,7 +11439,7 @@ OSGi Service Registry is a goal of this project.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/eclipse/sisu.plexus.git";)
+                     (url "https://github.com/eclipse/sisu.plexus";)
                      (commit (string-append "releases/" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 97c3a57..d5ff5bf 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -188,7 +188,7 @@ Explorer 6-9, Safari 4.x (and iPhone 3.x), and Firefox 
3.x.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/douglascrockford/JSON-js.git";)
+                      (url "https://github.com/douglascrockford/JSON-js";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -303,7 +303,7 @@ HTML tables with minimal effort.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/requirejs/requirejs.git";)
+                     (url "https://github.com/requirejs/requirejs";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm
index 5b57cc7..85d3863 100644
--- a/gnu/packages/jrnl.scm
+++ b/gnu/packages/jrnl.scm
@@ -38,7 +38,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/maebert/jrnl.git";)
+             (url "https://github.com/maebert/jrnl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 8db5e66..78488a4 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -61,7 +61,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/JuliaLang/libuv.git";)
+                       (url "https://github.com/JuliaLang/libuv";)
                        (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -196,7 +196,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vtjnash/libwhich.git";)
+             (url "https://github.com/vtjnash/libwhich";)
              ;; fixes linux-vdso.so related tests
              (commit "87cffe10080c98e7b5786c5166e420bf1ada1d41")))
        (file-name (string-append name "-" version "-checkout"))
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 3f16bc2..f826ebd 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -145,7 +145,7 @@ Messaging Protocol}.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/QuantStack/xeus.git";)
+                    (url "https://github.com/QuantStack/xeus";)
                     (commit version)))
               (sha256
                (base32
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 742172a..556dd6b 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -90,7 +90,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/graeme-hill/crossguid.git";)
+                      (url "https://github.com/graeme-hill/crossguid";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -140,7 +140,7 @@ generator library for C++.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/xbmc/libdvdnav.git";)
+                      (url "https://github.com/xbmc/libdvdnav";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -175,7 +175,7 @@ generator library for C++.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/xbmc/libdvdread.git";)
+                      (url "https://github.com/xbmc/libdvdread";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -210,7 +210,7 @@ generator library for C++.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/xbmc/libdvdcss.git";)
+                      (url "https://github.com/xbmc/libdvdcss";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -273,7 +273,7 @@ alternatives. In compilers, this can reduce the cascade of 
secondary errors.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/xbmc/xbmc.git";)
+                    (url "https://github.com/xbmc/xbmc";)
                     (commit (string-append version "-Leia"))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index c66718a..366ea2c 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -613,7 +613,7 @@ suitable for both the desktop and mobile devices.")
          ;; 'tegaki-recognize.in' are missing in the tarball.
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tegaki/tegaki.git";)
+               (url "https://github.com/tegaki/tegaki";)
                (commit commit)))
          (sha256
           (base32
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index 396b37d..2067e45 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -78,7 +78,7 @@ restrictions that stem from limitations of the standard RCX 
firmware.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/leozide/leocad.git";)
+                    (url "https://github.com/leozide/leocad";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index d449e07..f6ee355 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -63,7 +63,7 @@ text editors.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/wofr06/lesspipe.git";)
+                    (url "https://github.com/wofr06/lesspipe";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index ce958d8..7b13d98 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -128,7 +128,7 @@ version of libusb to run with newer libusb.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/usb4java/libusb4java.git";)
+                      (url "https://github.com/usb4java/libusb4java";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -356,7 +356,7 @@ I2C and SPI devices attached to the USB Hub.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libimobiledevice/libplist.git";)
+             (url "https://github.com/libimobiledevice/libplist";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -596,7 +596,7 @@ devices.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libusb/hidapi.git";)
+             (url "https://github.com/libusb/hidapi";)
              (commit (string-append "hidapi-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e47bc80..9fa7d0c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1005,7 +1005,7 @@ It has been modified to remove all non-free binary 
blobs.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/teleshoes/acpi_call.git";)
+               (url "https://github.com/teleshoes/acpi_call";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1048,7 +1048,7 @@ and should be used with caution, especially on untested 
models.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/aircrack-ng/rtl8812au.git";)
+               (url "https://github.com/aircrack-ng/rtl8812au";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1094,7 +1094,7 @@ RTL8812AU, RTL8821AU, and RTL8814AU chips.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tomaspinho/rtl8821ce.git";)
+               (url "https://github.com/tomaspinho/rtl8821ce";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1217,7 +1217,7 @@ supported under @file{/sys/class/backlight/}.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/umlaeute/v4l2loopback.git";)
+                    (url "https://github.com/umlaeute/v4l2loopback";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3038,7 +3038,7 @@ for systems using the Linux kernel.  This includes 
commands such as
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rvoicilas/inotify-tools.git";)
+                    (url "https://github.com/rvoicilas/inotify-tools";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3117,7 +3117,7 @@ from the module-init-tools project.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rfjakob/earlyoom.git";)
+                    (url "https://github.com/rfjakob/earlyoom";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3413,7 +3413,7 @@ mapper.  Kernel components are part of Linux-libre.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jthornber/thin-provisioning-tools.git";)
+             (url "https://github.com/jthornber/thin-provisioning-tools";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3652,7 +3652,7 @@ country-specific regulations for the wireless spectrum.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/groeck/lm-sensors.git";)
+             (url "https://github.com/groeck/lm-sensors";)
              (commit (string-append "V" (string-join
                                          (string-split version #\.) "-")))))
        (file-name (git-file-name name version))
@@ -5056,7 +5056,7 @@ feature, and a laptop with an accelerometer.  It has no 
effect on SSDs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vmatare/thinkfan.git";)
+             (url "https://github.com/vmatare/thinkfan";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5114,7 +5114,7 @@ from userspace.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/teleshoes/tpacpi-bat.git";)
+             (url "https://github.com/teleshoes/tpacpi-bat";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5456,7 +5456,7 @@ cpufreq sub-system is enabled or not.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jirka-h/haveged.git";)
+             (url "https://github.com/jirka-h/haveged";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5733,7 +5733,7 @@ developers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/clbr/radeontop.git";)
+             (url "https://github.com/clbr/radeontop";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5887,7 +5887,7 @@ monitoring tools for Linux.  These include @code{mpstat}, 
@code{iostat},
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/haikarainen/light.git";)
+             (url "https://github.com/haikarainen/light";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s"))
@@ -5975,7 +5975,7 @@ interface in sysfs, which can be accomplished with the 
included udev rules.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/linrunner/TLP.git";)
+             (url "https://github.com/linrunner/TLP";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -6207,7 +6207,7 @@ userspace queueing component and the logging subsystem.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/proot-me/PRoot.git";)
+             (url "https://github.com/proot-me/PRoot";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6650,7 +6650,7 @@ interface to this kernel feature.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dgraziotin/mbpfan.git";)
+             (url "https://github.com/dgraziotin/mbpfan";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6685,7 +6685,7 @@ privileges.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/intel/opa-psm2.git";)
+                    (url "https://github.com/intel/opa-psm2";)
                     (commit (string-append "PSM2_" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6803,7 +6803,7 @@ management tools in userspace.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vishvananda/netlink.git";)
+                    (url "https://github.com/vishvananda/netlink";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -6875,7 +6875,7 @@ file systems.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jeremie-koenig/genext2fs.git";)
+                    (url "https://github.com/jeremie-koenig/genext2fs";)
                     ;; 1.4.1-3 had a VCS tag but 1.4.1-4 doesn't.
                     (commit "9ee43894634998b0b2b309d636f25c64314c9421")))
               (file-name (git-file-name name version))
@@ -7028,7 +7028,7 @@ set as @code{LD_PRELOAD} to override the C library file 
system functions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/linuxwacom/input-wacom.git";)
+                    (url "https://github.com/linuxwacom/input-wacom";)
                     (commit (string-append "input-wacom-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm
index 510bc03..7b11f19 100644
--- a/gnu/packages/lirc.scm
+++ b/gnu/packages/lirc.scm
@@ -114,7 +114,7 @@ on just one button press.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tompreston/python-lirc.git";)
+               (url "https://github.com/tompreston/python-lirc";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 13c065c..04c7c3e 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -146,7 +146,7 @@ In order to make one or several variables file-local, use 
the macros
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sionescu/fiveam.git";)
+             (url "https://github.com/sionescu/fiveam";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "fiveam" version))
        (sha256
@@ -176,7 +176,7 @@ interactive development model in mind.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sionescu/bordeaux-threads.git";)
+                    (url "https://github.com/sionescu/bordeaux-threads";)
                     (commit (string-append "v" version))))
               (sha256
                (base32 "19i443fz3488v1pbbr9x24y8h8vlyhny9vj6c9jk5prm702awrp6"))
@@ -209,7 +209,7 @@ support.")
          (method git-fetch)
          (uri
           (git-reference
-           (url 
"https://github.com/trivial-gray-streams/trivial-gray-streams.git";)
+           (url "https://github.com/trivial-gray-streams/trivial-gray-streams";)
            (commit commit)))
          (sha256
           (base32 "0b1pxlccmnagk9cbh4cy8s5k66g3x0gwib5shjwr24xvrji6lp94"))
@@ -240,7 +240,7 @@ thin compatibility layer for gray streams.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/joaotavora/fiasco.git";)
+               (url "https://github.com/joaotavora/fiasco";)
                (commit commit)))
          (file-name (git-file-name "fiasco" version))
          (sha256
@@ -274,7 +274,7 @@ logical continuation of Stefil.  It focuses on interactive 
debugging.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edicl/flexi-streams.git";)
+             (url "https://github.com/edicl/flexi-streams";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "flexi-streams" version))
        (sha256
@@ -311,7 +311,7 @@ streams which are similar to string streams.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edicl/cl-ppcre.git";)
+             (url "https://github.com/edicl/cl-ppcre";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "cl-ppcre" version))
        (sha256
@@ -338,7 +338,7 @@ compatible with ANSI-compliant Common Lisp 
implementations.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/edicl/cl-unicode.git";)
+                    (url "https://github.com/edicl/cl-unicode";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -382,7 +382,7 @@ ANSI-compliant Common Lisp implementations.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/xach/zpb-ttf.git";)
+             (url "https://github.com/xach/zpb-ttf";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -495,7 +495,7 @@ anti-aliased vectorial paths.")))
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rpav/spatial-trees.git";)
+               (url "https://github.com/rpav/spatial-trees";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -532,7 +532,7 @@ spatially-extended data.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/robert-strandh/Flexichain.git";)
+               (url "https://github.com/robert-strandh/Flexichain";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -564,7 +564,7 @@ a sequence (or chain) of such elements.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mbattyani/cl-pdf.git";)
+               (url "https://github.com/mbattyani/cl-pdf";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -596,7 +596,7 @@ files.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/sharplispers/clx.git";)
+         (url "https://github.com/sharplispers/clx";)
          (commit version)))
        (sha256
         (base32
@@ -685,7 +685,7 @@ antialiased TrueType font rendering using CLX and XRender 
extension.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/joaotavora/sly.git";)
+           (url "https://github.com/joaotavora/sly";)
            (commit commit)))
          (sha256
           (base32 "0wbpg9p9yg2hd62l15pvy50fk3hndq5zzyqlyyf04g368s895144"))
@@ -1043,7 +1043,7 @@ It is similar to the @code{CL:LOOP} macro, with these 
distinguishing marks:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mishoo/cl-uglify-js.git";)
+               (url "https://github.com/mishoo/cl-uglify-js";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1164,7 +1164,7 @@ utilities that make it even easier to manipulate text in 
Common Lisp.  It has
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/trivial-features/trivial-features.git";)
+               (url "https://github.com/trivial-features/trivial-features";)
                (commit commit)))
          (file-name (git-file-name "trivial-features" version))
          (sha256
@@ -1250,7 +1250,7 @@ with a focus on interactive development.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cl-babel/babel.git";)
+               (url "https://github.com/cl-babel/babel";)
                (commit commit)))
          (file-name (git-file-name "babel" version))
          (sha256
@@ -1754,7 +1754,7 @@ streams, support is included for convenient stream 
wrappers.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/melisgl/named-readtables.git";)
+               (url "https://github.com/melisgl/named-readtables";)
                (commit commit)))
          (sha256
           (base32 "01l4831m7k84qvhzyx0qgdl50isr4zmp40qf6dfq2iqcaj8y4h3n"))
@@ -2520,7 +2520,7 @@ non-consing thread safe queues and fibonacci priority 
queues.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cffi/cffi.git";)
+             (url "https://github.com/cffi/cffi";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "cffi-bootstrap" version))
        (sha256
@@ -2805,7 +2805,7 @@ precisely controls the behavior of the parser via Common 
Lisp restarts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/trivial-garbage/trivial-garbage.git";)
+             (url "https://github.com/trivial-garbage/trivial-garbage";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "trivial-garbage" version))
        (sha256
@@ -3521,7 +3521,7 @@ client and server.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gwkkwg/trivial-backtrace.git";)
+             (url "https://github.com/gwkkwg/trivial-backtrace";)
              (commit commit)))
        (file-name (git-file-name "trivial-backtrace" version))
        (sha256
@@ -3566,7 +3566,7 @@ backtrace portably.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jdz/rfc2388.git";)
+             (url "https://github.com/jdz/rfc2388";)
              (commit commit)))
        (file-name (git-file-name "rfc2388" version))
        (sha256
@@ -3618,7 +3618,7 @@ RFC 1321 by R. Rivest, published April 1992.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cl-plus-ssl/cl-plus-ssl.git";)
+               (url "https://github.com/cl-plus-ssl/cl-plus-ssl";)
                (commit commit)))
          (file-name (git-file-name "cl+ssl" version))
          (sha256
@@ -3727,7 +3727,7 @@ encoding table that uses only URI-compatible characters.")
      (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/edicl/chunga.git";)
+              (url "https://github.com/edicl/chunga";)
               (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3756,7 +3756,7 @@ defined in RFC 2616.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/edicl/cl-who.git";)
+               (url "https://github.com/edicl/cl-who";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3788,7 +3788,7 @@ as good or bad as the next one.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/froydnj/chipz.git";)
+               (url "https://github.com/froydnj/chipz";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3820,7 +3820,7 @@ the format used by the popular compression tool bzip2.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edicl/drakma.git";)
+             (url "https://github.com/edicl/drakma";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3860,7 +3860,7 @@ sockets, SSL, continuable uploads, file uploads, cookies, 
and more.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edicl/hunchentoot.git";)
+             (url "https://github.com/edicl/hunchentoot";)
              (commit (string-append "v" version))))
        (file-name (git-file-name "hunchentoot" version))
        (sha256
@@ -3900,7 +3900,7 @@ connections (keep-alive), and SSL.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/m2ym/trivial-types.git";)
+             (url "https://github.com/m2ym/trivial-types";)
              (commit "ee869f2b7504d8aa9a74403641a5b42b16f47d88")))
        (file-name (git-file-name name version))
        (sha256
@@ -3924,7 +3924,7 @@ PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/m2ym/cl-syntax.git";)
+             (url "https://github.com/m2ym/cl-syntax";)
              (commit "03f0c329bbd55b8622c37161e6278366525e2ccc")))
        (file-name (git-file-name "cl-syntax" version))
        (sha256
@@ -3954,7 +3954,7 @@ PROPER-LIST, ASSOCIATION-LIST, PROPERTY-LIST and TUPLE.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/m2ym/cl-annot.git";)
+               (url "https://github.com/m2ym/cl-annot";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4087,7 +4087,7 @@ addition, removal, and random selection.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/fukamachi/quri.git";)
+               (url "https://github.com/fukamachi/quri";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4123,7 +4123,7 @@ Lisp. It is intended to be a replacement of PURI.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/myway.git";)
+             (url "https://github.com/fukamachi/myway";)
              (commit commit)))
        (file-name (git-file-name "myway" version))
        (sha256
@@ -4266,7 +4266,7 @@ Lisp.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sionescu/static-vectors.git";)
+             (url "https://github.com/sionescu/static-vectors";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4300,7 +4300,7 @@ memory.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wlbr/cl-marshal.git";)
+             (url "https://github.com/wlbr/cl-marshal";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -4327,7 +4327,7 @@ Only minimal changes required to make your CLOS objects 
serializable.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/rpav/CheckL.git";)
+               (url "https://github.com/rpav/CheckL";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4365,7 +4365,7 @@ against the last run.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rpav/fast-io.git";)
+             (url "https://github.com/rpav/fast-io";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -4404,7 +4404,7 @@ streams (though primarily the former, while wrapping the 
latter).")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Rudolph-Miller/jonathan.git";)
+             (url "https://github.com/Rudolph-Miller/jonathan";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -4516,7 +4516,7 @@ reset to 0 and you're able to read it again.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack-request" version))
        (sha256
@@ -4557,7 +4557,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dlowe-net/local-time.git";)
+             (url "https://github.com/dlowe-net/local-time";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -4592,7 +4592,7 @@ Long Painful History of Time\".")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -4633,7 +4633,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack-component" version))
        (sha256
@@ -4669,7 +4669,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack-util" version))
        (sha256
@@ -4707,7 +4707,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack-middleware-backtrace" version))
        (sha256
@@ -4743,7 +4743,7 @@ performance and simplicity in mind.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Shinmera/trivial-mimes.git";)
+               (url "https://github.com/Shinmera/trivial-mimes";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4790,7 +4790,7 @@ mime-type of a file.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack-middleware-static" version))
        (sha256
@@ -4830,7 +4830,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/lack.git";)
+             (url "https://github.com/fukamachi/lack";)
              (commit commit)))
        (file-name (git-file-name "lack" version))
        (sha256
@@ -4867,7 +4867,7 @@ performance and simplicity in mind.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/fukamachi/ningle.git";)
+               (url "https://github.com/fukamachi/ningle";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -4930,7 +4930,7 @@ performance and simplicity in mind.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/clack.git";)
+             (url "https://github.com/fukamachi/clack";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -5026,7 +5026,7 @@ port within a range.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/tgutu/clunit.git";)
+               (url "https://github.com/tgutu/clunit";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5059,7 +5059,7 @@ experience.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/bendudson/py4cl.git";)
+               (url "https://github.com/bendudson/py4cl";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5158,7 +5158,7 @@ high-level way.  This library provides such operators.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/mcandre/cl-quickcheck.git";)
+               (url "https://github.com/mcandre/cl-quickcheck";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5189,7 +5189,7 @@ high-level way.  This library provides such operators.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/snmsts/burgled-batteries3.git";)
+               (url "https://github.com/snmsts/burgled-batteries3";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -5254,7 +5254,7 @@ CPython implementation of Python) and Common Lisp.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gwkkwg/metabang-bind.git";)
+               (url "https://github.com/gwkkwg/metabang-bind";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6633,7 +6633,7 @@ programming style and the efficiency of an iterative 
programming style.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jwiegley/periods.git";)
+               (url "https://github.com/jwiegley/periods";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6686,7 +6686,7 @@ providing functions compatible with the series Common 
Lisp library.")))
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gwkkwg/metatilities-base.git";)
+               (url "https://github.com/gwkkwg/metatilities-base";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6718,7 +6718,7 @@ which implements a set of utilities.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/gwkkwg/cl-containers.git";)
+               (url "https://github.com/gwkkwg/cl-containers";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6807,7 +6807,7 @@ on the XPTest package by Craig Brozensky and the JUnit 
package by Kent Beck.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/jwiegley/cambl.git";)
+               (url "https://github.com/jwiegley/cambl";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6865,7 +6865,7 @@ purpose of financial calculations."))))
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ledger/cl-ledger.git";)
+               (url "https://github.com/ledger/cl-ledger";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6910,7 +6910,7 @@ system.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/glv2/bst.git";)
+               (url "https://github.com/glv2/bst";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -6941,7 +6941,7 @@ can contain any kind of values.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/glv2/cl-octet-streams.git";)
+             (url "https://github.com/glv2/cl-octet-streams";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6976,7 +6976,7 @@ cl-plumbing libraries.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/glv2/cl-lzlib.git";)
+               (url "https://github.com/glv2/cl-lzlib";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7021,7 +7021,7 @@ compression/decompression using bindings to the lzlib C 
library.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/zkat/chanl.git";)
+               (url "https://github.com/zkat/chanl";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7056,7 +7056,7 @@ threads.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/skypher/cl-store.git";)
+               (url "https://github.com/skypher/cl-store";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7365,7 +7365,7 @@ Clojure, as well as several expansions on the idea.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/glv2/simple-parallel-tasks.git";)
+               (url "https://github.com/glv2/simple-parallel-tasks";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7429,7 +7429,7 @@ binary heap and a Fibonacci heap) as well as an efficient 
priority queue.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/eschulte/curry-compose-reader-macros.git";)
+           (url "https://github.com/eschulte/curry-compose-reader-macros";)
            (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7460,7 +7460,7 @@ of function partial application and composition.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/phmarek/yason.git";)
+             (url "https://github.com/phmarek/yason";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7537,7 +7537,7 @@ interactive development.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/eschulte/graph.git";)
+           (url "https://github.com/eschulte/graph";)
            (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7640,7 +7640,7 @@ results.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/Shinmera/documentation-utils.git";)
+           (url "https://github.com/Shinmera/documentation-utils";)
            (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -7978,7 +7978,7 @@ intending to program in Lisp.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/edicl/cl-interpol.git";)
+               (url "https://github.com/edicl/cl-interpol";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8018,7 +8018,7 @@ doesn't support them.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/AccelerationNet/symbol-munger.git";)
+               (url "https://github.com/AccelerationNet/symbol-munger";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8057,7 +8057,7 @@ and camel-case rules.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/AccelerationNet/lisp-unit2.git";)
+               (url "https://github.com/AccelerationNet/lisp-unit2";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8090,7 +8090,7 @@ by Chris Riesbeck.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/AccelerationNet/symbol-munger.git";)
+               (url "https://github.com/AccelerationNet/symbol-munger";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8146,7 +8146,7 @@ and camel-case rules.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/AccelerationNet/cl-csv.git";)
+               (url "https://github.com/AccelerationNet/cl-csv";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8185,7 +8185,7 @@ from/to strings, streams and files.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/sellout/external-program.git";)
+               (url "https://github.com/sellout/external-program";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -8221,7 +8221,7 @@ sacrificing much in the way of power.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ghollisjr/cl-ana.git";)
+             (url "https://github.com/ghollisjr/cl-ana";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -9302,7 +9302,7 @@ visualization.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/sharplispers/archive.git";)
+                      (url "https://github.com/sharplispers/archive";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -9470,7 +9470,7 @@ transforming Common Lisp code to continuation passing 
style.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/takagi/cl-coroutine.git";)
+               (url "https://github.com/takagi/cl-coroutine";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9517,7 +9517,7 @@ continuations of the @code{cl-cont} library.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orthecreedence/vom.git";)
+               (url "https://github.com/orthecreedence/vom";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9548,7 +9548,7 @@ has a small codebase that's easy to understand and use.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orthecreedence/cl-libuv.git";)
+               (url "https://github.com/orthecreedence/cl-libuv";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9598,7 +9598,7 @@ has a small codebase that's easy to understand and use.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orthecreedence/cl-async.git";)
+               (url "https://github.com/orthecreedence/cl-async";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9726,7 +9726,7 @@ Common Lisp.  It uses the libuv library as backend.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orthecreedence/blackbird.git";)
+               (url "https://github.com/orthecreedence/blackbird";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9761,7 +9761,7 @@ the successor to the now-deprecated cl-async-future 
project.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orthecreedence/cl-async-future.git";)
+               (url "https://github.com/orthecreedence/cl-async-future";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9796,7 +9796,7 @@ to cl-async.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/thezerobit/green-threads.git";)
+               (url "https://github.com/thezerobit/green-threads";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9844,7 +9844,7 @@ possible.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/hargettp/cl-base32.git";)
+               (url "https://github.com/hargettp/cl-base32";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9875,7 +9875,7 @@ defined in RFC4648.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/glv2/cl-z85.git";)
+               (url "https://github.com/glv2/cl-z85";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -9906,7 +9906,7 @@ ZeroMQ.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/herth/ltk.git";)
+             (url "https://github.com/herth/ltk";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -9992,7 +9992,7 @@ from the one running the Lisp program by using a TCP 
connection.")))
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/djr7C4/cl-lex.git";)
+               (url "https://github.com/djr7C4/cl-lex";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10094,7 +10094,7 @@ the library does not depend on X11).
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/sharplispers/cl-jpeg.git";)
+               (url "https://github.com/sharplispers/cl-jpeg";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10174,7 +10174,7 @@ ones.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/xach/salza2.git";)
+             (url "https://github.com/xach/salza2";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10204,7 +10204,7 @@ respectively.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Ramarren/png-read.git";)
+               (url "https://github.com/Ramarren/png-read";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10233,7 +10233,7 @@ respectively.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/xach/zpng.git";)
+             (url "https://github.com/xach/zpng";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10260,7 +10260,7 @@ respectively.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jnjcc/cl-qrencode.git";)
+             (url "https://github.com/jnjcc/cl-qrencode";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -10293,7 +10293,7 @@ them as PNG files.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/hdfgroup/hdf5-cffi.git";)
+               (url "https://github.com/hdfgroup/hdf5-cffi";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10354,7 +10354,7 @@ them as PNG files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lvaruzza/cl-randist.git";)
+             (url "https://github.com/lvaruzza/cl-randist";)
              (commit "f088a54b540a7adefab7c04094a6103f9edda3d0")))
        (file-name (git-file-name name version))
        (sha256
@@ -10386,7 +10386,7 @@ generation functions from the GSL library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Shinmera/float-features.git";)
+             (url "https://github.com/Shinmera/float-features";)
              (commit "d3ef60181635b0849aa28cfc238053b7ca4644b0")))
        (file-name (git-file-name name version))
        (sha256
@@ -10420,7 +10420,7 @@ covered by the Common Lisp standard.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/AccelerationNet/function-cache.git";)
+             (url "https://github.com/AccelerationNet/function-cache";)
              (commit "6a5ada401e57da2c8abf046f582029926e61fce8")))
        (file-name (git-file-name name version))
        (sha256
@@ -10462,7 +10462,7 @@ caching based on arguments (an expanded form of 
memoization).")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/guicho271828/type-r.git";)
+               (url "https://github.com/guicho271828/type-r";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10499,7 +10499,7 @@ the elements in compound type specifier, e.g. 
@code{dimensions} in
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/guicho271828/trivialib.type-unify.git";)
+               (url "https://github.com/guicho271828/trivialib.type-unify";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10538,7 +10538,7 @@ correctly.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/numcl/specialized-function.git";)
+               (url "https://github.com/numcl/specialized-function";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10580,7 +10580,7 @@ code.  The main target of this macro is speed.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/numcl/constantfold.git";)
+               (url "https://github.com/numcl/constantfold";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10618,7 +10618,7 @@ additional form that is considered as a candidate for a 
constant.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/numcl/gtype.git";)
+               (url "https://github.com/numcl/gtype";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10658,7 +10658,7 @@ type correctness in Common Lisp.  It is based on CLtL2 
extensions.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/numcl/numcl.git";)
+               (url "https://github.com/numcl/numcl";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10705,7 +10705,7 @@ and usefulness, not speed.  Track the progress at
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/orivej/pzmq.git";)
+               (url "https://github.com/orivej/pzmq";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10752,7 +10752,7 @@ lightweight messaging kernel.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/Shinmera/clss.git";)
+           (url "https://github.com/Shinmera/clss";)
            (commit commit)))
          (sha256
           (base32 "0la4dbcda78x29szanylccrsljqrn9d1mhh569sqkyp44ni5fv91"))
@@ -10784,7 +10784,7 @@ selectors.  It makes use of the Plump-DOM and is used 
by lQuery.")
          (method git-fetch)
          (uri
           (git-reference
-           (url "https://github.com/Shinmera/lquery.git";)
+           (url "https://github.com/Shinmera/lquery";)
            (commit commit)))
          (sha256
           (base32 "0520mcpxc2d6fdm8z61arpgd2z38kan7cf06qs373n5r64rakz6w"))
@@ -10823,7 +10823,7 @@ approach to templating.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/hackinghat/cl-mysql.git";)
+               (url "https://github.com/hackinghat/cl-mysql";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10865,7 +10865,7 @@ approach to templating.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/marijnh/Postmodern.git";)
+               (url "https://github.com/marijnh/Postmodern";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -10984,7 +10984,7 @@ foreign libraries.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/cl-dbi.git";)
+             (url "https://github.com/fukamachi/cl-dbi";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -11505,7 +11505,7 @@ accompaniment to the standard ANSI facilities.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/laynor/clx-xembed.git";)
+               (url "https://github.com/laynor/clx-xembed";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11568,7 +11568,7 @@ Streams in ICDE’05.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deadtrickster/prometheus.cl.git";)
+             (url "https://github.com/deadtrickster/prometheus.cl";)
              (commit "7352b92296996ff383503e19bdd3bcea30409a15")))
        (file-name (git-file-name name version))
        (sha256
@@ -11680,7 +11680,7 @@ Streams in ICDE’05.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/dardoria/uuid.git";)
+               (url "https://github.com/dardoria/uuid";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11712,7 +11712,7 @@ Streams in ICDE’05.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/Shinmera/dissect.git";)
+               (url "https://github.com/Shinmera/dissect";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11746,7 +11746,7 @@ and active restarts.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fukamachi/rove.git";)
+             (url "https://github.com/fukamachi/rove";)
              (commit "f3695db08203bf26f3b861dc22ac0f4257d3ec21")))
        (file-name (git-file-name name version))
        (sha256
@@ -11780,7 +11780,7 @@ This is intended to be a successor of Prove.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/death/exponential-backoff.git";)
+               (url "https://github.com/death/exponential-backoff";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11810,7 +11810,7 @@ learn about each of the parameters.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/fukamachi/sxql.git";)
+               (url "https://github.com/fukamachi/sxql";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11849,7 +11849,7 @@ learn about each of the parameters.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/lmj/1am.git";)
+               (url "https://github.com/lmj/1am";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11879,7 +11879,7 @@ learn about each of the parameters.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/telephil/cl-ascii-table.git";)
+               (url "https://github.com/telephil/cl-ascii-table";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -11906,7 +11906,7 @@ tables.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/SahilKang/cl-rdkafka.git";)
+             (url "https://github.com/SahilKang/cl-rdkafka";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12133,7 +12133,7 @@ implementations of those protocols for different 
purposes.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/masatoi/cl-libsvm-format.git";)
+               (url "https://github.com/masatoi/cl-libsvm-format";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -12168,7 +12168,7 @@ format.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/masatoi/cl-online-learning.git";)
+               (url "https://github.com/masatoi/cl-online-learning";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -12207,7 +12207,7 @@ online linear classification written in Common Lisp.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/masatoi/cl-random-forest.git";)
+               (url "https://github.com/masatoi/cl-random-forest";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -12249,7 +12249,7 @@ includes an implementation of Global Refinement of 
Random Forest.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/ahefner/bordeaux-fft.git";)
+               (url "https://github.com/ahefner/bordeaux-fft";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -12279,7 +12279,7 @@ portable Common Lisp.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/pkhuong/Napa-FFT3.git";)
+               (url "https://github.com/pkhuong/Napa-FFT3";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index aee32b0..b7bc21e 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -865,7 +865,7 @@ use with Clang, targeting C++11, C++14 and above.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/llvm/llvm-project.git";)
+             (url "https://github.com/llvm/llvm-project";)
              (commit (string-append "llvmorg-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index c95eadd..789f329 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -196,7 +196,7 @@ windows in a terminal, colorize, filter and merge.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gabime/spdlog.git";)
+             (url "https://github.com/gabime/spdlog";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm
index 3f62c4d..cdbff1f 100644
--- a/gnu/packages/lolcode.scm
+++ b/gnu/packages/lolcode.scm
@@ -34,7 +34,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/justinmeza/lci.git";)
+             (url "https://github.com/justinmeza/lci";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 7babb28..5479b89 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -515,7 +515,7 @@ to be non-intrusive, composable, and embeddable within 
existing applications.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Tieske/Penlight.git";)
+             (url "https://github.com/Tieske/Penlight";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -555,7 +555,7 @@ standard libraries.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stevedonovan/LDoc.git";)
+             (url "https://github.com/stevedonovan/LDoc";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -732,7 +732,7 @@ Grammars (PEGs).")
               ;; not include the pkg-config files.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/luvit/luv.git";)
+                    (url "https://github.com/luvit/luv";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -765,7 +765,7 @@ Grammars (PEGs).")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/keplerproject/lua-compat-5.3.git";)
+                 (url "https://github.com/keplerproject/lua-compat-5.3";)
                  (commit "daebe77a2f498817713df37f0bb316db1d82222f")))
            (file-name "lua-compat-5.3-checkout")
            (sha256
@@ -832,7 +832,7 @@ on numbers.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/jeremyong/Selene.git";)
+                    (url "https://github.com/jeremyong/Selene";)
                     ;; The release is quite old.
                     (commit "ffe1ade2568d4cff5894552be8f43e63e379a4c9")))
               (file-name "Selene")
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index cad5282..29f1a49 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -270,7 +270,7 @@ with freedesktop.org standard.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/IgnorantGuru/spacefm.git";)
+         (url "https://github.com/IgnorantGuru/spacefm";)
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 46128d2..d0da753 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -77,7 +77,7 @@
        ;; Download from github rather than launchpad because launchpad trunk
        ;; tarball hash is not deterministic.
        (uri (git-reference
-             (url "https://github.com/unity8-team/libdbusmenu-qt.git";)
+             (url "https://github.com/unity8-team/libdbusmenu-qt";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/machine-learning.scm 
b/gnu/packages/machine-learning.scm
index d6a1064..18a4ac9 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -93,7 +93,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/libfann/fann.git";)
+                      (url "https://github.com/libfann/fann";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -315,7 +315,7 @@ networks) based on simulation of (stochastic) flow in 
graphs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/fhcrc/mcl.git";)
+             (url "https://github.com/fhcrc/mcl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -584,7 +584,7 @@ in terms of new algorithms.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ReactiveX/RxCpp.git";)
+             (url "https://github.com/ReactiveX/RxCpp";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1rdpa3jlc181jd08nk437aar085h28i45s6nzrv65apb3xyyz0ij"))
@@ -803,7 +803,7 @@ computing environments.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/scikit-learn/scikit-learn.git";)
+             (url "https://github.com/scikit-learn/scikit-learn";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -860,7 +860,7 @@ data analysis.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/scikit-learn/scikit-learn.git";)
+                      (url "https://github.com/scikit-learn/scikit-learn";)
                       (commit version)))
                 (file-name (git-file-name "python-scikit-learn" version))
                 (sha256
@@ -1064,7 +1064,7 @@ association studies (GWAS) on extremely large data sets.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/kaldi-asr/kaldi.git";)
+                      (url "https://github.com/kaldi-asr/kaldi";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1175,7 +1175,7 @@ written in C++.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/alumae/gst-kaldi-nnet2-online.git";)
+                      (url "https://github.com/alumae/gst-kaldi-nnet2-online";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1247,7 +1247,7 @@ automatically.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/alumae/kaldi-gstreamer-server.git";)
+                      (url "https://github.com/alumae/kaldi-gstreamer-server";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1351,7 +1351,7 @@ Python.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tensorflow/tensorflow.git";)
+             (url "https://github.com/tensorflow/tensorflow";)
              (commit (string-append "v" version))))
        (file-name (string-append "tensorflow-" version "-checkout"))
        (sha256
@@ -1681,7 +1681,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/google/double-conversion.git";)
+                   (url "https://github.com/google/double-conversion";)
                    (commit commit)))
              (file-name
               (git-file-name "double-conversion"
@@ -1726,7 +1726,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n")))
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/google/highwayhash.git";)
+                   (url "https://github.com/google/highwayhash";)
                    (commit commit)))
              (file-name (string-append "highwayhash-0-" revision
                                        (string-take commit 7)
@@ -1974,7 +1974,7 @@ that:
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/facebookincubator/gloo.git";)
+               (url "https://github.com/facebookincubator/gloo";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 646d437..326173c 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -473,7 +473,7 @@ operating systems.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/neomutt/neomutt.git";)
+             (url "https://github.com/neomutt/neomutt";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -879,7 +879,7 @@ attachments, create new maildirs, and so on.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/kspi/notifymuch.git";)
+               (url "https://github.com/kspi/notifymuch";)
                (commit commit)))
          (sha256
           (base32
@@ -999,7 +999,7 @@ ing, and tagging large collections of email messages.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/aperezdc/notmuch-addrlookup-c.git";)
+                    (url "https://github.com/aperezdc/notmuch-addrlookup-c";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -1838,7 +1838,7 @@ program's primary purpose.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/andywingo/esmtp.git";)
+             (url "https://github.com/andywingo/esmtp";)
              (commit "01bf9fc")))
        (sha256
         (base32
@@ -2931,7 +2931,7 @@ PGP handling, multiple servers, and secure connections.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/lefcha/imapfilter.git";)
+             (url "https://github.com/lefcha/imapfilter";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2991,7 +2991,7 @@ replacement for the @code{urlview} program.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/verdammelt/tnef.git";)
+             (url "https://github.com/verdammelt/tnef";)
              (commit version)))
        (sha256
         (base32 "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck"))
@@ -3077,7 +3077,7 @@ replacement for the @code{urlview} program.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Yeraze/ytnef.git";)
+                    (url "https://github.com/Yeraze/ytnef";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm
index 7ae73da..56a920d 100644
--- a/gnu/packages/markup.scm
+++ b/gnu/packages/markup.scm
@@ -43,7 +43,7 @@
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/hoedown/hoedown.git";)
+                    (url "https://github.com/hoedown/hoedown";)
                     (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -201,7 +201,7 @@ implementation.
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                    (url "https://github.com/jgm/cmark.git";)
+                    (url "https://github.com/jgm/cmark";)
                     (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -242,7 +242,7 @@ for parsing and rendering CommonMark.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Gottox/smu.git";)
+             (url "https://github.com/Gottox/smu";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e5b336a..b75fd25 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -263,7 +263,7 @@ triangulations.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/cvxopt/cvxopt.git";)
+                    (url "https://github.com/cvxopt/cvxopt";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -840,7 +840,7 @@ plotting engine by third-party applications like Octave.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/OkoSanto/GCTP.git";)
+             (url "https://github.com/OkoSanto/GCTP";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1340,7 +1340,7 @@ Swath).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Blosc/hdf5-blosc.git";)
+             (url "https://github.com/Blosc/hdf5-blosc";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1823,7 +1823,7 @@ script files.")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/tpaviot/oce.git";)
+              (url "https://github.com/tpaviot/oce";)
               (commit (string-append "OCE-" version))))
         (file-name (git-file-name name version))
         (patches (search-patches "opencascade-oce-glibc-2.26.patch"))
@@ -2023,7 +2023,7 @@ ASCII text files using Gmsh's own scripting language.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/gerddie/maxflow.git";)
+                    (url "https://github.com/gerddie/maxflow";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2418,7 +2418,7 @@ bindings to almost all functions of SLEPc.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/metamath/metamath-exe.git";)
+             (url "https://github.com/metamath/metamath-exe";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3218,7 +3218,7 @@ point numbers.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/wxMaxima-developers/wxmaxima.git";)
+             (url "https://github.com/wxMaxima-developers/wxmaxima";)
              (commit (string-append "Version-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3326,7 +3326,7 @@ associated functions (e.g., contiguous and non-contiguous 
submatrix views).")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/beltoforion/muparser.git";)
+               (url "https://github.com/beltoforion/muparser";)
                (commit (string-append "v" upstream-version))))
          (file-name (git-file-name name version))
          (sha256
@@ -3527,7 +3527,7 @@ access to BLIS implementations via traditional BLAS 
routine calls.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/JuliaLang/openlibm.git";)
+             (url "https://github.com/JuliaLang/openlibm";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3566,7 +3566,7 @@ environments.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/JuliaLang/openspecfun.git";)
+             (url "https://github.com/JuliaLang/openspecfun";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3604,7 +3604,7 @@ Fresnel integrals, and similar related functions as 
well.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DrTimothyAldenDavis/SuiteSparse.git";)
+             (url "https://github.com/DrTimothyAldenDavis/SuiteSparse";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4140,7 +4140,7 @@ set.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/LLNL/hypre.git";)
+             (url "https://github.com/LLNL/hypre";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4596,7 +4596,7 @@ symmetric matrices.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/elemental/Elemental.git";)
+                     (url "https://github.com/elemental/Elemental";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5569,7 +5569,7 @@ fields of knowledge.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/niklasso/minisat.git";)
+               (url "https://github.com/niklasso/minisat";)
                (commit commit)))
          (file-name (string-append name "-" version "-checkout"))
          (sha256
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 66c6e3a..c4d2872 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -85,7 +85,7 @@ provides the Maven plugin generating the component 
metadata.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/apache/maven-resolver.git";)
+                    (url "https://github.com/apache/maven-resolver";)
                     (commit (string-append "maven-resolver-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 26704ec..9ffbe33 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -296,7 +296,7 @@ get_machine.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/oriansj/m2-planet.git";)
+                      (url "https://github.com/oriansj/m2-planet";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index eb1856a..3cdb4f2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -235,7 +235,7 @@ identi.ca and status.net).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sm00th/bitlbee-discord.git";)
+             (url "https://github.com/sm00th/bitlbee-discord";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1005,7 +1005,7 @@ and prevent message loss.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/irungentoo/toxcore.git";)
+                      (url "https://github.com/irungentoo/toxcore";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -1040,7 +1040,7 @@ and prevent message loss.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/TokTok/c-toxcore.git";)
+             (url "https://github.com/TokTok/c-toxcore";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1071,7 +1071,7 @@ messenger protocol.")
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/uTox/uTox.git";)
+           (url "https://github.com/uTox/uTox";)
            (commit (string-append "v" version))
            (recursive? #t))) ;; Needed for 'minini' git submodule.
      (file-name (string-append name "-" version "-checkout"))
@@ -1195,7 +1195,7 @@ connect with friends and family without anyone else 
listening in.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Bitmessage/PyBitmessage.git";)
+             (url "https://github.com/Bitmessage/PyBitmessage";)
              (commit version)))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
@@ -1639,7 +1639,7 @@ is also scriptable and extensible via Guile.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/boothj5/libmesode.git";)
+                    (url "https://github.com/boothj5/libmesode";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1670,7 +1670,7 @@ manual SSL certificate verification.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/strophe/libstrophe.git";)
+             (url "https://github.com/strophe/libstrophe";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1778,7 +1778,7 @@ building the IRC clients and bots.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/JFreegman/toxic.git";)
+             (url "https://github.com/JFreegman/toxic";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w"))
@@ -1863,7 +1863,7 @@ QMatrixClient project.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Nheko-Reborn/mtxclient.git";)
+             (url "https://github.com/Nheko-Reborn/mtxclient";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1913,7 +1913,7 @@ for the Matrix protocol.  It is built on to of 
@code{Boost.Asio}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Nheko-Reborn/nheko.git";)
+             (url "https://github.com/Nheko-Reborn/nheko";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2153,7 +2153,7 @@ Telegram messenger.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/tdlib/td.git";)
+                      (url "https://github.com/tdlib/td";)
                       (commit commit)))
                 (sha256
                  (base32
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index f6a1153..4299595 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -412,7 +412,7 @@ WSGI and the node exporter textfile collector.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/prometheus/node_exporter.git";)
+                    (url "https://github.com/prometheus/node_exporter";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -434,7 +434,7 @@ written in Go with pluggable metric collectors.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                      (url "https://github.com/emcrisostomo/fswatch.git";)
+                      (url "https://github.com/emcrisostomo/fswatch";)
                       (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 653eec5..3801eae 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -350,7 +350,7 @@ MPD servers, search and multimedia key support.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/joshkunz/ashuffle.git";)
+                    (url "https://github.com/joshkunz/ashuffle";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 0e5ca65..3089a22 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -222,7 +222,7 @@ score, keyboard, guitar, drum and controller views.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/clementine-player/Clementine.git";)
+                      (url "https://github.com/clementine-player/Clementine";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -329,7 +329,7 @@ playing your music.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/cmus/cmus.git";)
+                    (url "https://github.com/cmus/cmus";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -463,7 +463,7 @@ background while you work.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kode54/dumb.git";)
+             (url "https://github.com/kode54/dumb";)
              (commit version)))
        (sha256
         (base32 "1cnq6rb14d4yllr0yi32p9jmcig8avs3f43bvdjrx4r1mpawspi6"))
@@ -508,7 +508,7 @@ settings (aliasing, linear interpolation and cubic 
interpolation).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/hydrogen-music/hydrogen.git";)
+             (url "https://github.com/hydrogen-music/hydrogen";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -631,7 +631,7 @@ MusePack, Monkey's Audio, and WavPack files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/digego/extempore.git";)
+                    (url "https://github.com/digego/extempore";)
                     (commit (string-append "v" version))))
               (sha256
                (base32
@@ -1136,7 +1136,7 @@ complete studio.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sjaehn/BSEQuencer.git";)
+                    (url "https://github.com/sjaehn/BSEQuencer";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1172,7 +1172,7 @@ with a selectable pattern matrix size.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/sjaehn/BChoppr.git";)
+               (url "https://github.com/sjaehn/BChoppr";)
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
@@ -1277,7 +1277,7 @@ your own lessons.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/powertab/powertabeditor.git";)
+                      (url "https://github.com/powertab/powertabeditor";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1315,7 +1315,7 @@ Editor.  It is compatible with Power Tab Editor 1.7 and 
Guitar Pro.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/jalv_select.git";)
+                    (url "https://github.com/brummer10/jalv_select";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1860,7 +1860,7 @@ projects.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/libpd/libpd.git";)
+                    (url "https://github.com/libpd/libpd";)
                     (commit version)
                     (recursive? #t)))   ; for the 'pure-data' submodule
               (file-name (string-append name "-" version "-checkout"))
@@ -1941,7 +1941,7 @@ using a system-independent interface.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/extemporelang/portmidi.git";)
+                      (url "https://github.com/extemporelang/portmidi";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -2283,7 +2283,7 @@ allows you to send JACK MIDI events (i.e. play) using 
your PC keyboard.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/kmatheussen/jack_capture.git";)
+                    (url "https://github.com/kmatheussen/jack_capture";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -2474,7 +2474,7 @@ follows a traditional multi-track tape recorder control 
paradigm.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/blablack/ams-lv2.git";)
+             (url "https://github.com/blablack/ams-lv2";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2515,7 +2515,7 @@ and hold, etc.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/gxtuner.git";)
+                    (url "https://github.com/brummer10/gxtuner";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2603,7 +2603,7 @@ socket or command line.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/chronitis/curseradio.git";)
+                      (url "https://github.com/chronitis/curseradio";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -2638,7 +2638,7 @@ tune-in sender list from 
@url{http://opml.radiotime.com}.";)
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/PromyLOPh/pianobar.git";)
+                    (url "https://github.com/PromyLOPh/pianobar";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2860,7 +2860,7 @@ websites such as Libre.fm.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/yask123/Instant-Music-Downloader.git";)
+                      (url 
"https://github.com/yask123/Instant-Music-Downloader";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -2978,7 +2978,7 @@ websites such as Libre.fm.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/milkytracker/MilkyTracker.git";)
+                    (url "https://github.com/milkytracker/MilkyTracker";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3023,7 +3023,7 @@ websites such as Libre.fm.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/schismtracker/schismtracker.git";)
+                    (url "https://github.com/schismtracker/schismtracker";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3211,7 +3211,7 @@ standard MIDI file with the csvmidi program.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/GxGuvnor.lv2.git";)
+                    (url "https://github.com/brummer10/GxGuvnor.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3335,7 +3335,7 @@ simulation of a push pull transistor fuzz effect with 
added high octave."))))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/brummer10/GxSuppaToneBender.lv2.git";)
+                    (url "https://github.com/brummer10/GxSuppaToneBender.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3374,7 +3374,7 @@ saturation effect."))))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/GxHyperion.lv2.git";)
+                    (url "https://github.com/brummer10/GxHyperion.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3392,7 +3392,7 @@ simulation of the Hyperion Fuzz pedal.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/GxVoodoFuzz.lv2.git";)
+                    (url "https://github.com/brummer10/GxVoodoFuzz.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3412,7 +3412,7 @@ parallel with a DarkBooster, followed by a volume 
control.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/brummer10/GxSuperFuzz.lv2.git";)
+                    (url "https://github.com/brummer10/GxSuperFuzz.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3432,7 +3432,7 @@ adjusts the amount of harmonics.")))
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/brummer10/GxVintageFuzzMaster.lv2.git";)
+                    (url 
"https://github.com/brummer10/GxVintageFuzzMaster.lv2";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -3493,7 +3493,7 @@ a simulation of an analog Wah pedal with switchless 
activation."))))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ssj71/rkrlv2.git";)
+                      (url "https://github.com/ssj71/rkrlv2";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -3523,7 +3523,7 @@ maintainer these will get merged into the original 
project.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/moddevices/mod-utilities.git";)
+                      (url "https://github.com/moddevices/mod-utilities";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -3807,7 +3807,7 @@ are a C compiler and glib.  Full API documentation and 
examples are included.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/LMMS/lmms.git";)
+             (url "https://github.com/LMMS/lmms";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3859,7 +3859,7 @@ are a C compiler and glib.  Full API documentation and 
examples are included.")
         ,(origin
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/mjansson/rpmalloc.git";)
+                 (url "https://github.com/mjansson/rpmalloc";)
                  (commit "b5bdc18051bb74a22f0bde4bcc90b01cf590b496")))
            (sha256
             (base32
@@ -3896,7 +3896,7 @@ audio samples and various soft sythesizers.  It can 
receive input from a MIDI ke
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/musescore/MuseScore.git";)
+             (url "https://github.com/musescore/MuseScore";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3969,7 +3969,7 @@ sample library.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/muse-sequencer/muse.git";)
+                    (url "https://github.com/muse-sequencer/muse";)
                     (commit (string-append "muse_"
                                            (string-map (lambda (c)
                                                          (if (char=? c #\.)
@@ -4153,7 +4153,7 @@ notation and includes basic support for digital audio.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/OpenMusicKontrollers/patchmatrix.git";)
+                    (url "https://github.com/OpenMusicKontrollers/patchmatrix";)
                     (commit version)))
               (file-name (git-file-name "patchmatrix" version))
               (sha256
@@ -4224,7 +4224,7 @@ the electronic or dubstep genre.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pedrolcl/Linux-SonivoxEas.git";)
+                    (url "https://github.com/pedrolcl/Linux-SonivoxEas";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -4437,7 +4437,7 @@ at @code{musicbrainz.org}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/trizen/clyrics.git";)
+             (url "https://github.com/trizen/clyrics";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4732,7 +4732,7 @@ complete without obstructing your daily work.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/altdesktop/playerctl.git";)
+                    (url "https://github.com/altdesktop/playerctl";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4800,7 +4800,7 @@ and reverb.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/sadko4u/lsp-plugins.git";)
+               (url "https://github.com/sadko4u/lsp-plugins";)
                (commit (string-append "lsp-plugins-" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -4871,7 +4871,7 @@ and debugging of event signal flows inside plugin 
graphs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jpcima/spectacle.git";)
+             (url "https://github.com/jpcima/spectacle";)
              (commit (string-append "v" version))
              ;; Bundles a specific commit of the DISTRHO plugin framework.
              (recursive? #t)))
@@ -4968,7 +4968,7 @@ audio and MIDI plugins that can also run as standalone 
JACK applications.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/zamaudio/zam-plugins.git";)
+         (url "https://github.com/zamaudio/zam-plugins";)
          (commit version)
          ;; Recursive to fetch the DISTRHO plugin framework. This
          ;; framework is intended to be included in the sources
@@ -5060,7 +5060,7 @@ It can also play and mix samples.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/DISTRHO/DPF-Plugins.git";)
+         (url "https://github.com/DISTRHO/DPF-Plugins";)
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5107,7 +5107,7 @@ Soul Force), MVerb, Nekobi, and ProM.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/x42/avldrums.lv2.git";)
+             (url "https://github.com/x42/avldrums.lv2";)
              (commit (string-append "v" version))
              ;; This plugin expects the robtk submodule's source files to be
              ;; there in order to build.
@@ -5151,7 +5151,7 @@ MIDI drums and comes as two separate drumkits: Black 
Pearl and Red Zeppelin.")
         (method git-fetch)
         (uri
           (git-reference
-            (url "https://github.com/mtytel/helm.git";)
+            (url "https://github.com/mtytel/helm";)
             (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -5269,7 +5269,7 @@ plugin support, JACK support and chord assistance.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/michaelwillis/dragonfly-reverb.git";)
+         (url "https://github.com/michaelwillis/dragonfly-reverb";)
          (commit version)
          ;; Bundles a specific commit of the DISTRHO plugin framework.
          (recursive? #t)))
@@ -5355,7 +5355,7 @@ automation that comes as an LV2 plugin bundle with a 
custom UI.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/linuxmao-org/VL1-emulator.git";)
+             (url "https://github.com/linuxmao-org/VL1-emulator";)
              (commit (string-append "v" version))
              ;; bundles a specific commit of the DISTRHO plugin framework
              (recursive? #t)))
@@ -5395,7 +5395,7 @@ standalone JACK application.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/linuxmao-org/regrader.git";)
+             (url "https://github.com/linuxmao-org/regrader";)
              (commit (string-append "v" version))
              ;; bundles a specific commit of the DISTRHO plugin framework
              (recursive? #t)))
@@ -5447,7 +5447,7 @@ plugin and a standalone JACK application.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/moddevices/tap-lv2.git";)
+                 (url "https://github.com/moddevices/tap-lv2";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -5487,7 +5487,7 @@ plugin and a standalone JACK application.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/pdesaulniers/wolf-shaper.git";)
+               (url "https://github.com/pdesaulniers/wolf-shaper";)
                (commit (string-append "v" version))
                ;; Bundles a specific commit of the DISTRHO plugin framework.
                (recursive? #t)))
@@ -5569,7 +5569,7 @@ It is provided as an LV2 plugin and as a standalone Jack 
application.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/linuxmao-org/shiru-plugins.git";)
+                 (url "https://github.com/linuxmao-org/shiru-plugins";)
                  (commit commit)
                  ;; Bundles a specific commit of the DISTRHO plugin framework.
                  (recursive? #t)))
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 44f81c9..53599fe 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -615,7 +615,7 @@ written in the C programming language.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/edenhill/librdkafka.git";)
+                    (url "https://github.com/edenhill/librdkafka";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1064,7 +1064,7 @@ virtual machines, and certificates.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/vishvananda/netns.git";)
+                      (url "https://github.com/vishvananda/netns";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1090,7 +1090,7 @@ handling network namespaces in Go.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/ishidawataru/sctp.git";)
+                      (url "https://github.com/ishidawataru/sctp";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1221,7 +1221,7 @@ reusing frequently-requested web pages.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/vgropp/bwm-ng.git";)
+             (url "https://github.com/vgropp/bwm-ng";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1783,7 +1783,7 @@ library remains flexible, portable, and easily 
embeddable.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/yrutschle/sslh.git";)
+             (url "https://github.com/yrutschle/sslh";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2194,7 +2194,7 @@ updates to the zebra daemon.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/vanhauser-thc/thc-ipv6.git";)
+                       (url "https://github.com/vanhauser-thc/thc-ipv6";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -2505,7 +2505,7 @@ networks using zeromq.  It has these key characteristics:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/linux-can/can-utils.git";)
+                    (url "https://github.com/linux-can/can-utils";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2686,7 +2686,7 @@ SNMP v3 using both IPv4 and IPv6.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/GNS3/ubridge.git";)
+             (url "https://github.com/GNS3/ubridge";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2725,7 +2725,7 @@ Ethernet and TAP interfaces is supported.  Packet capture 
is also supported.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ZerBea/hcxtools.git";)
+             (url "https://github.com/ZerBea/hcxtools";)
              (commit version)))
        (sha256
         (base32 "0k2qlq9hz5zc21nyc6yrnfqzga7hydn5mm0x3rpl2fhkwl81lxcn"))
@@ -2759,7 +2759,7 @@ packets from wireless devices for use with hashcat or 
John the Ripper.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ZerBea/hcxdumptool.git";)
+             (url "https://github.com/ZerBea/hcxdumptool";)
              (commit version)))
        (sha256
         (base32 "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf"))
@@ -2873,7 +2873,7 @@ communication over HTTP.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Stiffstream/restinio.git";)
+                    (url "https://github.com/Stiffstream/restinio";)
                     (commit (string-append "v." version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2915,7 +2915,7 @@ and targeted primarily for asynchronous processing of 
HTTP-requests.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/savoirfairelinux/opendht.git";)
+                    (url "https://github.com/savoirfairelinux/opendht";)
                     (commit version)))
               (file-name (git-file-name name version))
               (patches (search-patches "opendht-fix-jami.patch"))
@@ -3085,7 +3085,7 @@ module @code{batman-adv}, for Layer 2.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pagekite/PyPagekite.git";)
+             (url "https://github.com/pagekite/PyPagekite";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index 27cd5c1..b1d6d4c 100644
--- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -253,7 +253,7 @@ function with browser support.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/npm/node-semver.git";)
+                    (url "https://github.com/npm/node-semver";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5792c1f..1b40063 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -238,7 +238,7 @@ functional, imperative and object-oriented styles of 
programming.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml/ocamlbuild.git";)
+             (url "https://github.com/ocaml/ocamlbuild";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -533,7 +533,7 @@ Git-friendly development workflow.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/camlp5/camlp5.git";)
+             (url "https://github.com/camlp5/camlp5";)
              (commit (string-append "rel" (string-delete #\. version)))))
        (file-name (git-file-name name version))
        (sha256
@@ -620,7 +620,7 @@ written in Objective Caml.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml/num.git";)
+             (url "https://github.com/ocaml/num";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -666,7 +666,7 @@ the OCaml core distribution.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml/tuareg.git";)
+             (url "https://github.com/ocaml/tuareg";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -843,7 +843,7 @@ libpanel, librsvg and quartz.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/bcpierce00/unison.git";)
+                    (url "https://github.com/bcpierce00/unison";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1156,7 +1156,7 @@ GNU CC attributes.  It provides also a C pretty printer 
as an example of use.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/c-cube/qcheck.git";)
+             (url "https://github.com/c-cube/qcheck";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1683,7 +1683,7 @@ simple (yet expressive) query language to select the 
tests to run.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alainfrisch/ppx_tools.git";)
+             (url "https://github.com/alainfrisch/ppx_tools";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256 (base32
@@ -1738,7 +1738,7 @@ lets the client choose the concrete timeline.")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/savonet/ocaml-ssl.git";)
+              (url "https://github.com/savonet/ocaml-ssl";)
               (commit version)))
         (file-name (git-file-name name version))
         (sha256 (base32
@@ -2575,7 +2575,7 @@ programs.  It allows the definition of simple macros and 
file inclusion.  Cpp oi
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/c-cube/seq.git";)
+             (url "https://github.com/c-cube/seq";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2613,7 +2613,7 @@ standard iterator type starting from 4.07.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml/ocaml-re.git";)
+             (url "https://github.com/ocaml/ocaml-re";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2722,7 +2722,7 @@ writing to these structures, and they are accessed via 
the Bigarray module.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mirage/ezjsonm.git";)
+             (url "https://github.com/mirage/ezjsonm";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2755,7 +2755,7 @@ JSON.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mirage/ocaml-uri.git";)
+             (url "https://github.com/mirage/ocaml-uri";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2822,7 +2822,7 @@ Format module of the OCaml standard library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/alavrik/piqi.git";)
+             (url "https://github.com/alavrik/piqi";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3120,7 +3120,7 @@ function that follows the prototype of POSIX's wcwidth.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/diml/zed.git";)
+             (url "https://github.com/diml/zed";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3150,7 +3150,7 @@ connect an engine to your inputs and rendering functions 
to get an editor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/diml/lambda-term.git";)
+             (url "https://github.com/diml/lambda-term";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3186,7 +3186,7 @@ instead of bindings to a C library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml-community/utop.git";)
+             (url "https://github.com/ocaml-community/utop";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3377,7 +3377,7 @@ cross-platform SDL C library.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deducteam/dedukti.git";)
+             (url "https://github.com/deducteam/dedukti";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3522,7 +3522,7 @@ collection.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rlepigre/ocaml-bindlib.git";)
+             (url "https://github.com/rlepigre/ocaml-bindlib";)
              (commit (string-append "ocaml-bindlib_" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3730,7 +3730,7 @@ format}.  @code{craml} is released as a single binary 
(called @code{craml}).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocaml/merlin.git";)
+             (url "https://github.com/ocaml/merlin";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4174,7 +4174,7 @@ OCaml AST in the OCaml syntax;
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_compare.git";)
+                     (url "https://github.com/janestreet/ppx_compare";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4299,7 +4299,7 @@ new record values.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_sexp_conv.git";)
+                     (url "https://github.com/janestreet/ppx_sexp_conv";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4328,7 +4328,7 @@ definitions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url 
"https://github.com/janestreet/ppx_variants_conv.git";)
+                     (url "https://github.com/janestreet/ppx_variants_conv";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4457,7 +4457,7 @@ storage of large amounts of data.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_hash.git";)
+                     (url "https://github.com/janestreet/ppx_hash";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4488,7 +4488,7 @@ hash functions from type exrpessions and definitions.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_enumerate.git";)
+                     (url "https://github.com/janestreet/ppx_enumerate";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4839,7 +4839,7 @@ useful errors on failure.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_expect.git";)
+                     (url "https://github.com/janestreet/ppx_expect";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4914,7 +4914,7 @@ packages.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_typerep_conv.git";)
+                     (url "https://github.com/janestreet/ppx_typerep_conv";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4980,7 +4980,7 @@ verification tool.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/ppx_bin_prot.git";)
+                     (url "https://github.com/janestreet/ppx_bin_prot";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5149,7 +5149,7 @@ Configurator allows one to:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/spawn.git";)
+                     (url "https://github.com/janestreet/spawn";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5197,7 +5197,7 @@ thousands of times faster than fork.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/core.git";)
+                     (url "https://github.com/janestreet/core";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5237,7 +5237,7 @@ standard library that was developed by Jane Street.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/janestreet/core_kernel.git";)
+                     (url "https://github.com/janestreet/core_kernel";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -5340,7 +5340,7 @@ stream, and convert everything to UTF-8.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ocsigen/tyxml.git";)
+             (url "https://github.com/ocsigen/tyxml";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5375,7 +5375,7 @@ combinators.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/aantron/bisect_ppx.git";)
+             (url "https://github.com/aantron/bisect_ppx";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5460,7 +5460,7 @@ complexity of the OCaml module system.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Chris00/fftw-ocaml.git";)
+             (url "https://github.com/Chris00/fftw-ocaml";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5496,7 +5496,7 @@ library FFTW.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mmottl/lacaml.git";)
+             (url "https://github.com/mmottl/lacaml";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -5529,7 +5529,7 @@ convenience functions for vectors and matrices.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Chris00/ocaml-cairo.git";)
+                    (url "https://github.com/Chris00/ocaml-cairo";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -5559,7 +5559,7 @@ and SVG file output.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/garrigue/lablgtk.git";)
+                    (url "https://github.com/garrigue/lablgtk";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm
index dc690f3..dc49309 100644
--- a/gnu/packages/ocr.scm
+++ b/gnu/packages/ocr.scm
@@ -93,7 +93,7 @@ monospaced or proportional.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/taku910/zinnia.git";)
+               (url "https://github.com/taku910/zinnia";)
                (commit commit)))
          (sha256
           (base32
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index cd31dfd..8d04806 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -147,7 +147,7 @@ from the protocol files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/thkukuk/libnsl.git";)
+                    (url "https://github.com/thkukuk/libnsl";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index f14d5df..593b904 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -58,7 +58,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/KhronosGroup/OpenCL-Headers.git";)
+                      (url "https://github.com/KhronosGroup/OpenCL-Headers";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -109,7 +109,7 @@ programming.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/KhronosGroup/OpenCL-CLHPP.git";)
+             (url "https://github.com/KhronosGroup/OpenCL-CLHPP";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm"))
@@ -181,7 +181,7 @@ Loader as provided by this package.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Oblomov/clinfo.git";)
+             (url "https://github.com/Oblomov/clinfo";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -223,7 +223,7 @@ the system.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/intel/beignet.git";)
+             (url "https://github.com/intel/beignet";)
              (commit (string-append "Release_v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -303,7 +303,7 @@ back-end for the LLVM compiler framework.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pocl/pocl.git";)
+             (url "https://github.com/pocl/pocl";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a"))
diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm
index 18aba64..cca0b37 100644
--- a/gnu/packages/opencog.scm
+++ b/gnu/packages/opencog.scm
@@ -44,7 +44,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/cogutil.git";)
+                      (url "https://github.com/opencog/cogutil";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -76,7 +76,7 @@ utilities use for typical programming tasks in multiple 
OpenCog projects.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/atomspace.git";)
+                      (url "https://github.com/opencog/atomspace";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -122,7 +122,7 @@ features not otherwise available.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/cogserver.git";)
+                      (url "https://github.com/opencog/cogserver";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -164,7 +164,7 @@ OpenCog framework.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/attention.git";)
+                      (url "https://github.com/opencog/attention";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -209,7 +209,7 @@ tasks.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/opencog.git";)
+                      (url "https://github.com/opencog/opencog";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -260,7 +260,7 @@ combination.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/opencog/agi-bio.git";)
+                      (url "https://github.com/opencog/agi-bio";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm
index 036050d..aa70748 100644
--- a/gnu/packages/pantheon.scm
+++ b/gnu/packages/pantheon.scm
@@ -41,7 +41,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/elementary/granite.git";)
+                    (url "https://github.com/elementary/granite";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -79,7 +79,7 @@ in apps built for the Pantheon desktop.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/elementary/calculator.git";)
+             (url "https://github.com/elementary/calculator";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -120,7 +120,7 @@ desktop.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/elementary/sideload.git";)
+             (url "https://github.com/elementary/sideload";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index b7f9689..0dffffd 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -203,7 +203,7 @@ algorithms AES or Twofish.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pwsafe/pwsafe.git";)
+             (url "https://github.com/pwsafe/pwsafe";)
              (commit version)))
        (sha256
         (base32 "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh"))
@@ -587,7 +587,7 @@ key URIs using the standard otpauth:// scheme.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/IJHack/QtPass.git";)
+             (url "https://github.com/IJHack/QtPass";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -711,7 +711,7 @@ using password-store through rofi interface:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/browserpass/browserpass-native.git";)
+             (url "https://github.com/browserpass/browserpass-native";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 0d58c21..c26977b 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -325,7 +325,7 @@ you to figure out what is going on in that merge you keep 
avoiding.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/getpatchwork/patchwork.git";)
+                    (url "https://github.com/getpatchwork/patchwork";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 0ad1263..5cf93ad 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -312,7 +312,7 @@ Poppler PDF rendering library.")
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/libharu/libharu.git";)
+                   (url "https://github.com/libharu/libharu";)
                    (commit (string-append
                             "RELEASE_"
                             (string-join (string-split version #\.) "_")))))
@@ -827,7 +827,7 @@ using a stylus.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/xournalpp/xournalpp.git";)
+             (url "https://github.com/xournalpp/xournalpp";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1064,7 +1064,7 @@ the framebuffer.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dawbarton/pdf2svg.git";)
+                    (url "https://github.com/dawbarton/pdf2svg";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1161,7 +1161,7 @@ python-pypdf2 instead.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jeromerobert/pdfarranger.git";)
+             (url "https://github.com/jeromerobert/pdfarranger";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1261,7 +1261,7 @@ multiple files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pdfpc/pdfpc.git";)
+             (url "https://github.com/pdfpc/pdfpc";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/perl6.scm b/gnu/packages/perl6.scm
index 04e37a3..e02dd75 100644
--- a/gnu/packages/perl6.scm
+++ b/gnu/packages/perl6.scm
@@ -268,7 +268,7 @@ prompt.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url 
"https://github.com/perlpilot/Grammar-Profiler-Simple.git";)
+                 (url "https://github.com/perlpilot/Grammar-Profiler-Simple";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -315,7 +315,7 @@ deserializing JSON.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/jonathanstowe/JSON-Class.git";)
+               (url "https://github.com/jonathanstowe/JSON-Class";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -347,7 +347,7 @@ respectively.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/timo/json_fast.git";)
+               (url "https://github.com/timo/json_fast";)
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
@@ -370,7 +370,7 @@ but it offers a few extra features.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/jonathanstowe/JSON-Marshal.git";)
+               (url "https://github.com/jonathanstowe/JSON-Marshal";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -397,7 +397,7 @@ of the same class using @code{JSON::Unmarshal}.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/jonathanstowe/JSON-Name.git";)
+               (url "https://github.com/jonathanstowe/JSON-Name";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -426,7 +426,7 @@ It will of course also be needed in classes thar are going 
to use
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/tadzik/JSON-Unmarshal.git";)
+                 (url "https://github.com/tadzik/JSON-Unmarshal";)
                  (commit commit)))
         (file-name (git-file-name name version))
         (sha256
@@ -475,7 +475,7 @@ licences therein.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/jonathanstowe/META6.git";)
+               (url "https://github.com/jonathanstowe/META6";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -612,7 +612,7 @@ with optional labels, or xy plots).")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/perl6/tap-harness6.git";)
+               (url "https://github.com/perl6/tap-harness6";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -642,7 +642,7 @@ minimal wrapper around an instance of this module.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/tadzik/Terminal-ANSIColor.git";)
+               (url "https://github.com/tadzik/Terminal-ANSIColor";)
                ;; The commit where 0.5 was "tagged"
                (commit "edded4a7116ce11cbc9fb5a83669c7ba119d0212")))
         (file-name (git-file-name name version))
@@ -715,7 +715,7 @@ statement for @code{Test::Mock}.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/perl6-community-modules/uri.git";)
+               (url "https://github.com/perl6-community-modules/uri";)
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
@@ -763,7 +763,7 @@ character numbering.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/ugexe/zef.git";)
+               (url "https://github.com/ugexe/zef";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm
index 6c94a13..e4a4f79 100644
--- a/gnu/packages/phabricator.scm
+++ b/gnu/packages/phabricator.scm
@@ -33,7 +33,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/phacility/libphutil.git";)
+                      (url "https://github.com/phacility/libphutil";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -72,7 +72,7 @@ PHP.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/phacility/arcanist.git";)
+                      (url "https://github.com/phacility/arcanist";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm
index 95a9ea9..df80f12 100644
--- a/gnu/packages/popt.scm
+++ b/gnu/packages/popt.scm
@@ -107,7 +107,7 @@ similar to getopt(3), it contains a number of enhancements, 
including:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gflags/gflags.git";)
+             (url "https://github.com/gflags/gflags";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0"))
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 7b2c242..bbf98ee 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -42,7 +42,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Timmmm/robocut.git";)
+             (url "https://github.com/Timmmm/robocut";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -81,7 +81,7 @@ with Graphtec and Sihouette plotting cutters using an SVG 
file as its input.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pdewacht/brlaser.git";)
+                    (url "https://github.com/pdewacht/brlaser";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index bf992f6..3c96576 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -90,7 +90,7 @@ manner.  It also features an interactive interpreter.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/SWI-Prolog/swipl-devel.git";)
+                    (url "https://github.com/SWI-Prolog/swipl-devel";)
                     (recursive? #t) ; TODO: Determine if this can be split out.
                     (commit (string-append "V" version))))
               (file-name (git-file-name name version))
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 556bca6..49abb21 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -188,7 +188,7 @@ code.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mapbox/protozero.git";)
+             (url "https://github.com/mapbox/protozero";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -265,7 +265,7 @@ source files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ruby-protobuf/protobuf.git";)
+                    (url "https://github.com/ruby-protobuf/protobuf";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index b4a8d98..58c7e5b 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -354,7 +354,7 @@ curses-style interfaces.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/masmu/pulseaudio-dlna.git";)
+               (url "https://github.com/masmu/pulseaudio-dlna";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -403,7 +403,7 @@ install one or more of the following packages alongside 
pulseaudio-dlna:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cdemoulins/pamixer.git";)
+             (url "https://github.com/cdemoulins/pamixer";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -438,7 +438,7 @@ volume levels of the sinks (get, set, decrease, increase, 
toggle mute, etc).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/christophgysin/pasystray.git";)
+             (url "https://github.com/christophgysin/pasystray";)
              (commit (string-append name "-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 5c9c251..aed7dfc 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -719,7 +719,7 @@ ECB and OFB).")
       (origin
        (method git-fetch)
        (uri (git-reference
-              (url "https://github.com/wbond/asn1crypto.git";)
+              (url "https://github.com/wbond/asn1crypto";)
               (commit version)))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c3016c8..6f78adb 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2532,7 +2532,7 @@ on the command line.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/maxcountryman/flask-login.git";)
+             (url "https://github.com/maxcountryman/flask-login";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2764,7 +2764,7 @@ for Flask programs that are using @code{python-alembic}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edgewall/genshi.git";)
+             (url "https://github.com/edgewall/genshi";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 074ea39..109a14b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1309,7 +1309,7 @@ bits instead of primitive data types like @code{char}, 
@code{int}, etc.")
        ;; not included with the PyPI archive.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/eerimoq/cantools.git";)
+             (url "https://github.com/eerimoq/cantools";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2049,7 +2049,7 @@ and is not compatible with JSON.")
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/SCons/scons.git";)
+                   (url "https://github.com/SCons/scons";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -2401,7 +2401,7 @@ files.")
        ;; There's no source tarball on PyPI.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dbcli/cli_helpers.git";)
+             (url "https://github.com/dbcli/cli_helpers";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3428,7 +3428,7 @@ software version simply.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tantale/deprecated.git";)
+             (url "https://github.com/tantale/deprecated";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3464,7 +3464,7 @@ to deprecate classes, functions or methods.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/PyGithub/PyGithub.git";)
+             (url "https://github.com/PyGithub/PyGithub";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3531,7 +3531,7 @@ ecosystem, but can naturally be used also by other 
projects.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/robotframework/robotframework.git";)
+             (url "https://github.com/robotframework/robotframework";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3580,7 +3580,7 @@ process automation (RPA).")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/boakley/robotframework-lint.git";)
+               (url "https://github.com/boakley/robotframework-lint";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3611,7 +3611,7 @@ utility, a static analysis tool (linter) for Robot 
Framework source files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/robotframework/SSHLibrary.git";)
+             (url "https://github.com/robotframework/SSHLibrary";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -4016,7 +4016,7 @@ and is very extensible.")
        ;; git-reference because tests are not included in pypi source tarball
        ;; https://issues.guix.gnu.org/issue/36755#2
        (uri (git-reference
-             (url "https://github.com/projectmallard/mallard-ducktype.git";)
+             (url "https://github.com/projectmallard/mallard-ducktype";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4422,7 +4422,7 @@ color scales, and color space conversion easy.  It has 
support for:
         ,(origin ; The build script expects scipy-sphinx-theme as a git 
submodule
            (method git-fetch)
            (uri (git-reference
-                 (url "https://github.com/scipy/scipy-sphinx-theme.git";)
+                 (url "https://github.com/scipy/scipy-sphinx-theme";)
                  (commit "c466764e2231ba132c09826b5b138fffa1cfcec3")))
            (sha256
             (base32
@@ -4669,7 +4669,7 @@ To address this and enable easy cycling over arbitrary 
@code{kwargs}, the
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/njsmith/colorspacious.git";)
+             (url "https://github.com/njsmith/colorspacious";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5063,7 +5063,7 @@ as the original project seems to have been abandoned 
circa 2007.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pagekite/PySocksipyChain.git";)
+             (url "https://github.com/pagekite/PySocksipyChain";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5286,7 +5286,7 @@ Python's distutils.")
        ;; source from a (semi-arbitrary, i.e. latest as of now) git commit.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dieterv/elib.intl.git";)
+             (url "https://github.com/dieterv/elib.intl";)
              (commit "d09997cfef")))
        (file-name (string-append name "-" version "-checkout"))
        (sha256
@@ -5850,7 +5850,7 @@ memoizing PEG/Packrat parser in Python.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pygridtools/gridmap.git";)
+             (url "https://github.com/pygridtools/gridmap";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5881,7 +5881,7 @@ cluster without needing to write any wrapper code 
yourself.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nickstenning/honcho.git";)
+             (url "https://github.com/nickstenning/honcho";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7468,7 +7468,7 @@ falling into the Python interpreter.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/python-xlib/python-xlib.git";)
+             (url "https://github.com/python-xlib/python-xlib";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -8801,7 +8801,7 @@ Python Package Index (PyPI).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/trendmicro/tlsh.git";)
+             (url "https://github.com/trendmicro/tlsh";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -12893,7 +12893,7 @@ discovery, monitoring and configuration.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/schematics/schematics.git";)
+             (url "https://github.com/schematics/schematics";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -15284,7 +15284,7 @@ Swagger 2.0).")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/rochacbruno/flasgger.git";)
+              (url "https://github.com/rochacbruno/flasgger";)
               (commit version)))
         (file-name (git-file-name name version))
         (sha256
@@ -15817,7 +15817,7 @@ executed more than a given number of times during a 
given period.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kovidgoyal/dukpy.git";)
+             (url "https://github.com/kovidgoyal/dukpy";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -16284,7 +16284,7 @@ and works only with Python 2 and NumPy < 1.9.")
      (origin (method git-fetch)
              ;; Source tarball on PyPI doesn't include tests.
              (uri (git-reference
-                   (url "https://github.com/hsoft/send2trash.git";)
+                   (url "https://github.com/hsoft/send2trash";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -16413,7 +16413,7 @@ functions by partial application of operators.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Suor/funcy.git";)
+             (url "https://github.com/Suor/funcy";)
              (commit version)))
        (sha256
         (base32 "1s98vkjnq3zq71737hn8xa15kssvmy1sfzsll3vrlv53902418mw"))
@@ -16532,7 +16532,7 @@ source bytes using the UTF-8 encoding and then rewrites 
Python 3.6 style
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/python/typed_ast.git";)
+             (url "https://github.com/python/typed_ast";)
              (commit version)))
        (sha256
         (base32 "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb"))
@@ -16973,7 +16973,7 @@ manager compatible with @code{asyncio}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/miracle2k/python-glob2.git";)
+             (url "https://github.com/miracle2k/python-glob2";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -17163,7 +17163,7 @@ user-space file systems in Python.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/pybind/pybind11.git";)
+                    (url "https://github.com/pybind/pybind11";)
                     (commit (string-append "v" version))))
               (sha256
                (base32
@@ -18061,7 +18061,7 @@ on regular expressions.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rholder/retrying.git";)
+             (url "https://github.com/rholder/retrying";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -18858,7 +18858,7 @@ bindings for Python 2.5+ and 3.")))
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/oinume/iocapture.git";)
+               (url "https://github.com/oinume/iocapture";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -18898,7 +18898,7 @@ standard error channel (stderr) in your program.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/neithere/argh.git";)
+               (url "https://github.com/neithere/argh";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -19788,7 +19788,7 @@ HTML-containing files.")
        ;; sample.json5 is missing from PyPi source tarball
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dpranke/pyjson5.git";)
+             (url "https://github.com/dpranke/pyjson5";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -19830,7 +19830,7 @@ replacement for dictionaries where immutability is 
desired.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/matrix-org/python-unpaddedbase64.git";)
+             (url "https://github.com/matrix-org/python-unpaddedbase64";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4d95563..7e9036c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -106,7 +106,7 @@
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/steveire/grantlee.git";)
+              (url "https://github.com/steveire/grantlee";)
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 890c6f6..812aa31 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -82,7 +82,7 @@
     (source
      (origin (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/jgaeddert/liquid-dsp.git";)
+                   (url "https://github.com/jgaeddert/liquid-dsp";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
@@ -548,7 +548,7 @@ to the fix block above.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/csete/gqrx.git";)
+             (url "https://github.com/csete/gqrx";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -712,7 +712,7 @@ for correctness.")
       (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mossmann/hackrf.git";)
+             (url "https://github.com/mossmann/hackrf";)
              (commit commit)))
        (file-name (git-file-name name version))
        (sha256
@@ -1025,7 +1025,7 @@ gain and standing wave ratio.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/flightaware/dump1090.git";)
+             (url "https://github.com/flightaware/dump1090";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1067,7 +1067,7 @@ their position, altitude, speed, etc.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/merbanan/rtl_433.git";)
+             (url "https://github.com/merbanan/rtl_433";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1093,7 +1093,7 @@ from devices on the 433 MHz, 868 MHz, 315 MHz, 345 MHz 
and 915 MHz ISM bands.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/EliasOenal/multimon-ng.git";)
+             (url "https://github.com/EliasOenal/multimon-ng";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index 2fc7f0a..42cc240 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -290,7 +290,7 @@ directly.")
     (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/rails/rails-dom-testing.git";)
+            (url "https://github.com/rails/rails-dom-testing";)
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
@@ -533,7 +533,7 @@ application bootup, plugins, generators, and Rake tasks.")
        ;; Download from GitHub as test files are not provided in the gem.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rails/web-console.git";)
+             (url "https://github.com/rails/web-console";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 999c1e1..3471cb6 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -160,7 +160,7 @@ Lucene library, a high-performance, full-featured text 
search engine.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/swh/LRDF.git";)
+                    (url "https://github.com/swh/LRDF";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm
index e5b1b2c..c7ece52 100644
--- a/gnu/packages/rednotebook.scm
+++ b/gnu/packages/rednotebook.scm
@@ -35,7 +35,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jendrikseipp/rednotebook.git";)
+             (url "https://github.com/jendrikseipp/rednotebook";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index de7d08a..e261709 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -48,7 +48,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/grpc/grpc.git";)
+                    (url "https://github.com/grpc/grpc";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -124,7 +124,7 @@ browsers to backend services.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/grpc/grpc.git";)
+                    (url "https://github.com/grpc/grpc";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name "grpc" version))
               (sha256
@@ -207,7 +207,7 @@ with the HTTP/2-based RPC framework gRPC.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/apache/thrift.git";)
+             (url "https://github.com/apache/thrift";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm
index 0d8217e..214095a 100644
--- a/gnu/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -74,7 +74,7 @@ files in the destination.")
        (source (origin
             (method git-fetch)
             (uri (git-reference
-                   (url "https://github.com/librsync/librsync.git";)
+                   (url "https://github.com/librsync/librsync";)
                    (commit (string-append "v" version))))
             (file-name (git-file-name name version))
             (sha256
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 1ade88a..8f48c3e 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -224,7 +224,7 @@ a focus on simplicity and productivity.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mruby/mruby.git";)
+             (url "https://github.com/mruby/mruby";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -632,7 +632,7 @@ outcomes of a code example.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rspec/rspec-its.git";)
+             (url "https://github.com/rspec/rspec-its";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -993,7 +993,7 @@ line of code.")
      (origin
        (method git-fetch)               ;the gem lacks many test files
        (uri (git-reference
-             (url "https://github.com/xwmx/pandoc-ruby.git";)
+             (url "https://github.com/xwmx/pandoc-ruby";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1102,7 +1102,7 @@ syntax to the minimum while remaining clear.")
      (origin
        (method git-fetch)               ;the gem release lacks a Rakefile
        (uri (git-reference
-             (url "https://github.com/asciidoctor/asciidoctor.git";)
+             (url "https://github.com/asciidoctor/asciidoctor";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1206,7 +1206,7 @@ It does this through immutable data structures.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/sporkmonger/rack-mount.git";)
+                      (url "https://github.com/sporkmonger/rack-mount";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1662,7 +1662,7 @@ support.")
        ;; fetch from github as the gem does not contain testing code
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/rails/execjs.git";)
+             (url "https://github.com/rails/execjs";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2195,7 +2195,7 @@ standard output stream.")
        ;; the tests.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/thekompanee/fuubar.git";)
+             (url "https://github.com/thekompanee/fuubar";)
              (commit (string-append "releases/v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3108,7 +3108,7 @@ specs for Ruby implementations in ruby/spec.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/brianmario/mysql2.git";)
+             (url "https://github.com/brianmario/mysql2";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3533,7 +3533,7 @@ with processes on remote servers, via SSH2.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/net-ssh/net-scp.git";)
+             (url "https://github.com/net-ssh/net-scp";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3705,7 +3705,7 @@ is to be run.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url 
"https://github.com/adammck/minitest-pretty_diff.git";)
+                      (url "https://github.com/adammck/minitest-pretty_diff";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -4215,7 +4215,7 @@ Extensions} type detection using magic numbers, 
filenames, and extensions")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/halostatue/minitar.git";)
+               (url "https://github.com/halostatue/minitar";)
                (commit commit)))
          (file-name (string-append name "-" version "-checkout"))
          (sha256
@@ -4790,7 +4790,7 @@ define executable specifications of your code.")
      (origin
        (method git-fetch)               ;the distributed gem lacks tests
        (uri (git-reference
-             (url "https://github.com/rtomayko/tilt.git";)
+             (url "https://github.com/rtomayko/tilt";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5378,7 +5378,7 @@ a native C extension.")
        ;; repository.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/guard/listen.git";)
+             (url "https://github.com/guard/listen";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5518,7 +5518,7 @@ multibyte strings, internationalization, time zones, and 
testing.")
               ;; published gem and the tarball on Github is outdated.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rubys/nokogumbo.git";)
+                    (url "https://github.com/rubys/nokogumbo";)
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -5720,7 +5720,7 @@ other things and it comes with a command line interface.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deivid-rodriguez/byebug.git";)
+             (url "https://github.com/deivid-rodriguez/byebug";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5836,7 +5836,7 @@ including comments and whitespace.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/postmodern/tdiff.git";)
+                      (url "https://github.com/postmodern/tdiff";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -5863,7 +5863,7 @@ tree-like structures.  It is similar to Ruby's built-in 
@code{TSort} module.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/postmodern/nokogiri-diff.git";)
+                      (url "https://github.com/postmodern/nokogiri-diff";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -6409,7 +6409,7 @@ notes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/deivid-rodriguez/pry-byebug.git";)
+             (url "https://github.com/deivid-rodriguez/pry-byebug";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6564,7 +6564,7 @@ Profiling multiple threads simultaneously is supported.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/cucumber/messages-ruby.git";)
+                    (url "https://github.com/cucumber/messages-ruby";)
                     (commit "12cd07eac87bce7843fd1bb0bf64bc4da09f097c")))
               (file-name (git-file-name name version))
               (sha256
@@ -6822,7 +6822,7 @@ master/html-formatter/ruby")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cucumber/cucumber-ruby.git";)
+             (url "https://github.com/cucumber/cucumber-ruby";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6937,7 +6937,7 @@ in already-indented code.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cucumber/cucumber-ruby-core.git";)
+             (url "https://github.com/cucumber/cucumber-ruby-core";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6981,7 +6981,7 @@ and trust on your team.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cucumber/cucumber-expressions-ruby.git";)
+             (url "https://github.com/cucumber/cucumber-expressions-ruby";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -7039,7 +7039,7 @@ implemented and invoked on any platform.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cucumber/tag-expressions-ruby.git";)
+             (url "https://github.com/cucumber/tag-expressions-ruby";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9155,7 +9155,7 @@ technique.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ruby/rdoc.git";)
+             (url "https://github.com/ruby/rdoc";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9270,7 +9270,7 @@ strings or files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sass/sass-spec.git";)
+             (url "https://github.com/sass/sass-spec";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9457,7 +9457,7 @@ interface.  It allows Jekyll to rebuild your site when a 
file changes.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/grosser/parallel.git";)
+             (url "https://github.com/grosser/parallel";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -9870,7 +9870,7 @@ indentation will probably be an issue and hence this 
gem.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dtao/safe_yaml.git";)
+             (url "https://github.com/dtao/safe_yaml";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -10395,7 +10395,7 @@ then check out http://127.0.0.1:1080 to see the mail.")
        ;; The gem does not include test code, so fetch from the Git repository.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/castwide/backport.git";)
+             (url "https://github.com/castwide/backport";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 6fc0fd4..851a996 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -122,7 +122,7 @@
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/thepowersgang/mrustc.git";)
+                      (url "https://github.com/thepowersgang/mrustc";)
                       (commit (string-append "v" version))))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 4551e57..a34d704 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -890,7 +890,7 @@ small program, it is easy to comprehend, get to grips with, 
and use.")
                 ;; <ftp.ecn.purdue.edu/qobi/stalin-0.11-amd64-patches.tgz>
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/barak/stalin.git";)
+                      (url "https://github.com/barak/stalin";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
@@ -962,7 +962,7 @@ generation.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/JeffBezanson/femtolisp.git";)
+                      (url "https://github.com/JeffBezanson/femtolisp";)
                       (commit commit)))
                 (file-name (string-append name "-" version "-checkout"))
                 (sha256
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index af519de..0491731 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -159,7 +159,7 @@ window manager as well as the Tmux terminal multiplexer.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/nelhage/reptyr.git";)
+             (url "https://github.com/nelhage/reptyr";)
              (commit (string-append "reptyr-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 8f9f2ed..a2054ce 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -485,7 +485,7 @@ operations.")
               (method git-fetch)
               (uri
                (git-reference
-                (url "https://github.com/Yubico/libu2f-server.git";)
+                (url "https://github.com/Yubico/libu2f-server";)
                 (commit (string-append "libu2f-server-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -528,7 +528,7 @@ verifying the cryptographic operations.")
               (method git-fetch)
               (uri
                (git-reference
-                (url "https://github.com/Yubico/pam-u2f.git";)
+                (url "https://github.com/Yubico/pam-u2f";)
                 (commit (string-append "pam_u2f-" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 1502d16..558a64a 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -52,7 +52,7 @@
               (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/SELinuxProject/selinux.git";)
+                      (url "https://github.com/SELinuxProject/selinux";)
                       (commit release)))
                 (file-name (string-append "selinux-" release "-checkout"))
                 (sha256
@@ -327,7 +327,7 @@ based on required access.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/TresysTechnology/setools.git";)
+                    (url "https://github.com/TresysTechnology/setools";)
                     (commit version)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index be81715..fc0102c 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -60,7 +60,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/USCiLab/cereal.git";)
+             (url "https://github.com/USCiLab/cereal";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -145,7 +145,7 @@ serialization.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tarruda/libmpack.git";)
+             (url "https://github.com/tarruda/libmpack";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -175,7 +175,7 @@ that implements both the msgpack and msgpack-rpc 
specifications.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/libmpack/libmpack-lua.git";)
+             (url "https://github.com/libmpack/libmpack-lua";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -267,7 +267,7 @@ that implements both the msgpack and msgpack-rpc 
specifications.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jbeder/yaml-cpp.git";)
+             (url "https://github.com/jbeder/yaml-cpp";)
              (commit (string-append "yaml-cpp-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -321,7 +321,7 @@ it a convenient format to store user input files.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/open-source-parsers/jsoncpp.git";)
+                    (url "https://github.com/open-source-parsers/jsoncpp";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 6e5db43..1ebdfce 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -253,7 +253,7 @@ and syntax highlighting.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/oh-my-fish/plugin-foreign-env.git";)
+             (url "https://github.com/oh-my-fish/plugin-foreign-env";)
              (commit "dddd9213272a0ab848d474d0cbde12ad034e65bc")))
        (file-name (git-file-name name version))
        (sha256
@@ -300,7 +300,7 @@ into fish.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rakitzis/rc.git";)
+                    (url "https://github.com/rakitzis/rc";)
                     (commit (string-append "v" version))))
               (sha256
                (base32
@@ -744,7 +744,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dimkr/loksh.git";)
+             (url "https://github.com/dimkr/loksh";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 29e288a..b1db32a 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -50,7 +50,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url 
"https://github.com/zsh-users/zsh-autosuggestions.git";)
+                    (url "https://github.com/zsh-users/zsh-autosuggestions";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -96,7 +96,7 @@ as you type.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/rupa/z.git";)
+                    (url "https://github.com/rupa/z";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -194,7 +194,7 @@ are already there.")
     (source
      (origin (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/direnv/direnv.git";)
+                   (url "https://github.com/direnv/direnv";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
@@ -248,7 +248,7 @@ environment variables of the current shell.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jhawthorn/fzy.git";)
+             (url "https://github.com/jhawthorn/fzy";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -282,7 +282,7 @@ below the current cursor position, scrolling the screen if 
necessary.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/dvorka/hstr.git";)
+                     (url "https://github.com/dvorka/hstr";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -325,7 +325,7 @@ bookmark your favourite commands.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sharkdp/shell-functools.git";)
+                    (url "https://github.com/sharkdp/shell-functools";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index bbca246..b911b30 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -33,7 +33,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/simh/simh.git";)
+             (url "https://github.com/simh/simh";)
              (commit (string-append "v" version))))
        (sha256
         (base32 "1jiq6shj6a9xvzacvmyhxxd6xdyica8q4006qqjh5mh96rxrp15c"))
diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm
index d441dcf..2162725 100644
--- a/gnu/packages/sml.scm
+++ b/gnu/packages/sml.scm
@@ -37,7 +37,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/polyml/polyml.git";)
+                    (url "https://github.com/polyml/polyml";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index aaa552b..9ae3d94 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -78,7 +78,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/six-ddc/hss.git";)
+                    (url "https://github.com/six-ddc/hss";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -495,7 +495,7 @@ responsive, especially over Wi-Fi, cellular, and 
long-distance links.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/MisterTea/EternalTCP.git";)
+             (url "https://github.com/MisterTea/EternalTCP";)
              (commit (string-append "et-v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -828,7 +828,7 @@ of existing remote shell facilities such as SSH.")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/skeeto/endlessh.git";)
+              (url "https://github.com/skeeto/endlessh";)
               (commit version)))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 8633d11..7cbb6bf 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5630,7 +5630,7 @@ parameters.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/Gibbsdavidl/CatterPlots.git";)
+                      (url "https://github.com/Gibbsdavidl/CatterPlots";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -5653,7 +5653,7 @@ shaped points?  Now you can!")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jalvesaq/colorout.git";)
+             (url "https://github.com/jalvesaq/colorout";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/stenography.scm b/gnu/packages/stenography.scm
index f0193da..c462dea 100644
--- a/gnu/packages/stenography.scm
+++ b/gnu/packages/stenography.scm
@@ -36,7 +36,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/openstenoproject/plover.git";)
+             (url "https://github.com/openstenoproject/plover";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 372cea8..9f1c5e3 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -64,7 +64,7 @@
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/meganz/MEGAcmd.git";)
+              (url "https://github.com/meganz/MEGAcmd";)
               (commit (string-append version "_Linux"))
               (recursive? #t)))
         (sha256
@@ -266,7 +266,7 @@ their folder.
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/axkibe/lsyncd.git";)
+             (url "https://github.com/axkibe/lsyncd";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index dfc2220..e6a8ab4 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -663,7 +663,7 @@ inherent errors.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/chmduquesne/rollinghash.git";)
+                 (url "https://github.com/chmduquesne/rollinghash";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -687,7 +687,7 @@ hashes.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/petermattis/goid.git";)
+                       (url "https://github.com/petermattis/goid";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -711,7 +711,7 @@ the current goroutine's ID.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/kballard/go-shellquote.git";)
+                       (url "https://github.com/kballard/go-shellquote";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -761,7 +761,7 @@ notification library in Go.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/beorn7/perks.git";)
+                       (url "https://github.com/beorn7/perks";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -787,7 +787,7 @@ bounds.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/prometheus/client_model.git";)
+                       (url "https://github.com/prometheus/client_model";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -820,7 +820,7 @@ bounds.")
           (method git-fetch)
           (uri
             (git-reference
-              (url 
"https://github.com/matttproud/golang_protobuf_extensions.git";)
+              (url "https://github.com/matttproud/golang_protobuf_extensions";)
               (commit commit)))
           (file-name (git-file-name name version))
           (sha256
@@ -847,7 +847,7 @@ message streaming.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/prometheus/common.git";)
+                       (url "https://github.com/prometheus/common";)
                        (commit (string-append "v" version))))
                 (file-name (git-file-name name version))
                 (sha256
@@ -890,7 +890,7 @@ Prometheus metrics.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/prometheus/procfs.git";)
+                       (url "https://github.com/prometheus/procfs";)
                        (commit (string-append "v" version))))
                 (file-name (git-file-name name version))
                 (sha256
@@ -915,7 +915,7 @@ system, kernel, and process metrics from the @file{/proc} 
pseudo file system.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/prometheus/client_golang.git";)
+                       (url "https://github.com/prometheus/client_golang";)
                        (commit (string-append "v" version))))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1002,7 +1002,7 @@ language.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                       (url "https://github.com/flynn-archive/go-shlex.git";)
+                       (url "https://github.com/flynn-archive/go-shlex";)
                        (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -1025,7 +1025,7 @@ quoting, commenting, and escaping.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/AudriusButkevicius/pfilter.git";)
+               (url "https://github.com/AudriusButkevicius/pfilter";)
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
@@ -1050,7 +1050,7 @@ virtual connections from a single physical connection.")
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/ccding/go-stun.git";)
+                 (url "https://github.com/ccding/go-stun";)
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm
index 4db1552..1f8f8f3 100644
--- a/gnu/packages/synergy.scm
+++ b/gnu/packages/synergy.scm
@@ -42,7 +42,7 @@
      (origin
       (method git-fetch)
       (uri (git-reference
-            (url "https://github.com/symless/synergy-core.git";)
+            (url "https://github.com/symless/synergy-core";)
             (commit (string-append "v" version "-stable"))))
       (file-name (git-file-name name version))
       (sha256
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 542d36a..4c5e4d5 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -102,7 +102,7 @@
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/TimothyGu/libilbc.git";)
+         (url "https://github.com/TimothyGu/libilbc";)
          (commit
           (string-append "v" version))))
        (file-name
@@ -297,7 +297,7 @@ packet-manipulation library.")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/wernerd/ZRTPCPP.git";)
+         (url "https://github.com/wernerd/ZRTPCPP";)
          (commit
           (string-append "V" version))))
        (file-name
@@ -727,7 +727,7 @@ your calls and messages.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pjsip/pjproject.git";)
+             (url "https://github.com/pjsip/pjproject";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -813,7 +813,7 @@ Initiation Protocol (SIP) and a multimedia framework.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/grishka/libtgvoip.git";)
+             (url "https://github.com/grishka/libtgvoip";)
              (commit version)))
        (file-name (git-file-name name version))
        ;; Fix compilation on i686-linux architecture.
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 81ce223..2ece7e7 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -94,7 +94,7 @@
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lanoxx/tilda.git";)
+                    (url "https://github.com/lanoxx/tilda";)
                     (commit (string-append "tilda-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -365,7 +365,7 @@ combining, and so on, with a simple interface.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/npat-efault/picocom.git";)
+                    (url "https://github.com/npat-efault/picocom";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -407,7 +407,7 @@ to all types of devices that provide serial consoles.")
              ;; unmaintained for some time, and vulnerable to at least two 
CVEs:
              ;; 
https://github.com/johnath/beep/issues/11#issuecomment-454056858
              ;; Use this maintained fork instead.
-             (url "https://github.com/spkr-beep/beep.git";)
+             (url "https://github.com/spkr-beep/beep";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -438,7 +438,7 @@ has no notion of what's interesing, but it's very good at 
that notifying part.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mauke/unibilium.git";)
+             (url "https://github.com/mauke/unibilium";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -708,7 +708,7 @@ desktop installed to have a decent terminal emulator.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/nsf/termbox-go.git";)
+                      (url "https://github.com/nsf/termbox-go";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -766,7 +766,7 @@ usable with any list--including files, command history, 
processes and more.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/howeyc/gopass.git";)
+                      (url "https://github.com/howeyc/gopass";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -902,7 +902,7 @@ per-line fullscreen terminal rendering, and keyboard input 
event reporting.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tmate-io/tmate.git";)
+             (url "https://github.com/tmate-io/tmate";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -934,7 +934,7 @@ tmux.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/kovidgoyal/kitty.git";)
+             (url "https://github.com/kovidgoyal/kitty";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1041,7 +1041,7 @@ comfortably in a pager or editor.
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/MisterTea/EternalTerminal.git";)
+               (url "https://github.com/MisterTea/EternalTerminal";)
                (commit (string-append "et-v" version))))
         (file-name (git-file-name name version))
        (sha256
@@ -1081,7 +1081,7 @@ while also supporting native scrolling and @command{tmux} 
control mode
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/majestrate/wterm.git";)
+             (url "https://github.com/majestrate/wterm";)
              (commit "0ae42717c08a85a6509214e881422c7fbe7ecc45")))
        (sha256
          (base32
@@ -1137,7 +1137,7 @@ made by suckless.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/jwilm/alacritty.git";)
+             (url "https://github.com/jwilm/alacritty";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7b10433..c4f9f6c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3094,7 +3094,7 @@ this bundle for use independent of ConTeXt.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lualatex/luaotfload.git";)
+                    (url "https://github.com/lualatex/luaotfload";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 70e0503..dea26a6 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -253,7 +253,7 @@ Texi2HTML.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/baszoetekouw/pinfo.git";)
+                    (url "https://github.com/baszoetekouw/pinfo";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 924dc68..c3ee8cf 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -502,7 +502,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/wereturtle/ghostwriter.git";)
+                    (url "https://github.com/wereturtle/ghostwriter";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -559,7 +559,7 @@ environment with Markdown markup.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/olivierkes/manuskript.git";)
+             (url "https://github.com/olivierkes/manuskript";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -661,7 +661,7 @@ in plain text file format.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/editorconfig/editorconfig-core-c.git";)
+               (url "https://github.com/editorconfig/editorconfig-core-c";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -903,7 +903,7 @@ card.  It offers:
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vigna/ne.git";)
+                    (url "https://github.com/vigna/ne";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 090ac1d..3c765aa 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -259,7 +259,7 @@ the Hannon Lab.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/google/cityhash.git";)
+                      (url "https://github.com/google/cityhash";)
                       (commit commit)))
                 (file-name (string-append name "-" version ".tar.gz"))
                 (sha256
@@ -710,7 +710,7 @@ categories.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/williamh/dotconf.git";)
+                    (url "https://github.com/williamh/dotconf";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -878,7 +878,7 @@ source code.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/aflc/editdistance.git";)
+               (url "https://github.com/aflc/editdistance";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -1087,7 +1087,7 @@ Mainland China, Taiwan, and Hong-Kong.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/nurse/nkf.git";)
+                      (url "https://github.com/nurse/nkf";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 6eefb6c..0249334 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -247,7 +247,7 @@ datetime module, available in Python 2.3+.")
        (method git-fetch)
        ;; The PyPi distribution doesn't include the tests.
        (uri (git-reference
-             (url "https://github.com/closeio/ciso8601.git";)
+             (url "https://github.com/closeio/ciso8601";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm
index c028a88..c81b526 100644
--- a/gnu/packages/tmux.scm
+++ b/gnu/packages/tmux.scm
@@ -74,7 +74,7 @@ continue running in the background, then later reattached.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/jimeh/tmux-themepack.git";)
+                      (url "https://github.com/jimeh/tmux-themepack";)
                       (commit commit)))
                 (sha256
                  (base32
@@ -104,7 +104,7 @@ continue running in the background, then later reattached.")
     (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/jimeh/tmuxifier.git";)
+                   (url "https://github.com/jimeh/tmuxifier";)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (sha256
@@ -151,7 +151,7 @@ windows.")
        (method git-fetch)
        ;; PyPI source tarball does not include tests.
        (uri (git-reference
-             (url "https://github.com/tmux-python/libtmux.git";)
+             (url "https://github.com/tmux-python/libtmux";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -196,7 +196,7 @@ with live tmux sessions.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/edouardklein/daemux.git";)
+             (url "https://github.com/edouardklein/daemux";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -231,7 +231,7 @@ them, etc., by attaching to the corresponding pane in 
tmux.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/greymd/tmux-xpanes.git";)
+                    (url "https://github.com/greymd/tmux-xpanes";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 24d10cc..c852c54 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -218,7 +218,7 @@ networks.")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/micahflee/onionshare.git";)
+              (url "https://github.com/micahflee/onionshare";)
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index f643e06..459c0c4 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -42,7 +42,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mtoyoda/sl.git";)
+             (url "https://github.com/mtoyoda/sl";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 5151e63..d2a24c7 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -723,7 +723,7 @@ write native speed custom Git applications in any language 
with bindings.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/AGWA/git-crypt.git";)
+             (url "https://github.com/AGWA/git-crypt";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -971,7 +971,7 @@ repository")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/davisp/ghp-import.git";)
+             (url "https://github.com/davisp/ghp-import";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1102,7 +1102,7 @@ either a pure Python implementation, or the faster, but 
more resource intensive
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/kward/shflags.git";)
+                     (url "https://github.com/kward/shflags";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1185,7 +1185,7 @@ lot easier.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ctmarinas/stgit.git";)
+             (url "https://github.com/ctmarinas/stgit";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1237,7 +1237,7 @@ manipulate them in various ways.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/RichiH/vcsh.git";)
+             (url "https://github.com/RichiH/vcsh";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1312,7 +1312,7 @@ also walk each side of a merge and test those changes 
individually.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/sitaramc/gitolite.git";)
+             (url "https://github.com/sitaramc/gitolite";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2058,7 +2058,7 @@ output of the @code{git} command.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/0-wiz-0/findnewest.git";)
+             (url "https://github.com/0-wiz-0/findnewest";)
              (commit (string-append "findnewest-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2130,7 +2130,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/DanielDent/git-annex-remote-rclone.git";)
+             (url "https://github.com/DanielDent/git-annex-remote-rclone";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2399,7 +2399,7 @@ how information about the merge is displayed.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mhagger/git-imerge.git";)
+             (url "https://github.com/mhagger/git-imerge";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 9d156d7..e188b37 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1170,7 +1170,7 @@ audio/video codec library.")
       (origin
         (method git-fetch)
         (uri (git-reference
-              (url "https://github.com/stepmania/ffmpeg.git";)
+              (url "https://github.com/stepmania/ffmpeg";)
               (commit "eda6effcabcf9c238e4635eb058d72371336e09b")))
         (sha256
          (base32 "1by8rmbva8mfrivdbbkr2gx4kga89zqygkd4cfjl76nr8mdcdamb"))
@@ -1196,7 +1196,7 @@ audio/video codec library.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dirkvdb/ffmpegthumbnailer.git";)
+                    (url "https://github.com/dirkvdb/ffmpegthumbnailer";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1469,7 +1469,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mpv-player/mpv.git";)
+                    (url "https://github.com/mpv-player/mpv";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1798,7 +1798,7 @@ other site that youtube-dl supports.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/soimort/you-get.git";)
+                    (url "https://github.com/soimort/you-get";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1837,7 +1837,7 @@ audio, images) from the Web.  It can use either mpv or 
vlc for playback.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/trizen/youtube-viewer.git";)
+                    (url "https://github.com/trizen/youtube-viewer";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2221,7 +2221,7 @@ capabilities.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vapoursynth/vapoursynth.git";)
+                    (url "https://github.com/vapoursynth/vapoursynth";)
                     (commit (string-append "R" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2326,7 +2326,7 @@ from sites like Twitch.tv and pipes them into a video 
player of choice.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/BasioMeusPuga/twitchy.git";)
+               (url "https://github.com/BasioMeusPuga/twitchy";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2369,7 +2369,7 @@ from sites like Twitch.tv and pipes them into a video 
player of choice.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/mltframework/mlt.git";)
+                    (url "https://github.com/mltframework/mlt";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2462,7 +2462,7 @@ be used for realtime video capture via Linux-specific 
APIs.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/obsproject/obs-studio.git";)
+                    (url "https://github.com/obsproject/obs-studio";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -2631,7 +2631,7 @@ making @dfn{screencasts}.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/MaartenBaert/ssr.git";)
+             (url "https://github.com/MaartenBaert/ssr";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2771,7 +2771,7 @@ Content System specification.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mps-youtube/mps-youtube.git";)
+             (url "https://github.com/mps-youtube/mps-youtube";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -3226,7 +3226,7 @@ and ITU-T H.222.0.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/FFMS/ffms2.git";)
+                    (url "https://github.com/FFMS/ffms2";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -3328,7 +3328,7 @@ tools for styling them, including a built-in real-time 
video preview.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/pitivi/gst-transcoder.git";)
+             (url "https://github.com/pitivi/gst-transcoder";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -3442,7 +3442,7 @@ It counts more than 100 plugins.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Motion-Project/motion.git";)
+                    (url "https://github.com/Motion-Project/motion";)
                     (commit (string-append "release-" version))))
               (sha256
                (base32
@@ -3489,7 +3489,7 @@ changed.  Or in other words, it can detect motion.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/alexanderwink/subdl.git";)
+                      (url "https://github.com/alexanderwink/subdl";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -3523,7 +3523,7 @@ save it to the appropriate filename.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/l-smash/l-smash.git";)
+                    (url "https://github.com/l-smash/l-smash";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -3587,7 +3587,7 @@ online.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/georgmartius/vid.stab.git";)
+                      (url "https://github.com/georgmartius/vid.stab";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
@@ -3763,7 +3763,7 @@ speed and correctness.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/atomnuker/wlstream.git";)
+               (url "https://github.com/atomnuker/wlstream";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3860,7 +3860,7 @@ to convenience of translating and batch processing of 
multiple documents.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/FNA-XNA/Theorafile.git";)
+               (url "https://github.com/FNA-XNA/Theorafile";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -3921,7 +3921,7 @@ transcode or reformat the videos in any way, producing 
perfect backups.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/OpenVisualCloud/SVT-AV1.git";)
+                     (url "https://github.com/OpenVisualCloud/SVT-AV1";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -4065,7 +4065,7 @@ result in several formats:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/phw/peek.git";)
+             (url "https://github.com/phw/peek";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -4099,7 +4099,7 @@ can also directly record to WebM or MP4 if you prefer.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ammen99/wf-recorder.git";)
+                    (url "https://github.com/ammen99/wf-recorder";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index df63593..ab3492f 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -458,7 +458,7 @@ trouble using them, because you do not have to remember 
each snippet name.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/tpope/vim-fugitive.git";)
+               (url "https://github.com/tpope/vim-fugitive";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
@@ -574,7 +574,7 @@ are detected, the user is notified.")
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://github.com/editorconfig/editorconfig-vim.git";)
+               (url "https://github.com/editorconfig/editorconfig-vim";)
                (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 64cd815..051b81e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -878,7 +878,7 @@ mainly implemented in user space.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/abbbi/qmpbackup.git";)
+                     (url "https://github.com/abbbi/qmpbackup";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm
index d73dd56..6722258 100644
--- a/gnu/packages/vlang.scm
+++ b/gnu/packages/vlang.scm
@@ -33,7 +33,7 @@
     (origin
      (method git-fetch)
      (uri (git-reference
-           (url "https://github.com/vlang/v.git";)
+           (url "https://github.com/vlang/v";)
            (commit version)))
      (file-name (git-file-name name version))
      (sha256
@@ -103,7 +103,7 @@
           (origin
             (method git-fetch)
             (uri (git-reference
-                  (url "https://github.com/vlang/vc.git";)
+                  (url "https://github.com/vlang/vc";)
                   (commit vc-version)))
             (file-name (git-file-name "vc" vc-version))
             (sha256
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index dcfbe89..a084b30 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -51,7 +51,7 @@
                 (method git-fetch)
                 (uri
                  (git-reference
-                  (url "https://github.com/TigerVNC/tigervnc.git";)
+                  (url "https://github.com/TigerVNC/tigervnc";)
                   (commit commit)))
                 (sha256
                  (base32
@@ -238,7 +238,7 @@ where the server is installed.")))
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/LibVNC/libvncserver.git";)
+             (url "https://github.com/LibVNC/libvncserver";)
              (commit (string-append "LibVNCServer-" version))))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index ed9be6c..65cf5bd 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -227,7 +227,7 @@ the entire VPN in a network namespace accessible only 
through SSH.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/cernekee/ocproxy.git";)
+                     (url "https://github.com/cernekee/ocproxy";)
                      (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -327,7 +327,7 @@ traversing network address translators (@dfn{NAT}s) and 
firewalls.")
        ;; Thus, fetch code from Git.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ProtonVPN/linux-cli.git";)
+             (url "https://github.com/ProtonVPN/linux-cli";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -462,7 +462,7 @@ with configuration options for most of @command{sshuttle}’s 
features.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ambrop72/badvpn.git";)
+             (url "https://github.com/ambrop72/badvpn";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index a38959f..dd113bc 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -219,7 +219,7 @@ features including, tables, builtin image display, 
bookmarks, SSL and more.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/luakit/luakit.git";)
+                     (url "https://github.com/luakit/luakit";)
                      (commit version)))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1a7ea54..c7f4337 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -198,7 +198,7 @@ and its related documentation.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/GrahamDumpleton/mod_wsgi.git";)
+                    (url "https://github.com/GrahamDumpleton/mod_wsgi";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -423,7 +423,7 @@ documentation.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/giom/nginx_accept_language_module.git";)
+               (url "https://github.com/giom/nginx_accept_language_module";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -647,7 +647,7 @@ APIs.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/gnosek/fcgiwrap.git";)
+             (url "https://github.com/gnosek/fcgiwrap";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -844,7 +844,7 @@ It aims to conform to RFC 7159.")
               ;; do not use auto-generated tarballs
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/udp/json-parser.git";)
+                    (url "https://github.com/udp/json-parser";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -874,7 +874,7 @@ project)
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/flavio/qjson.git";)
+                    (url "https://github.com/flavio/qjson";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -914,7 +914,7 @@ instances, while JSON's objects will be mapped to 
@code{QVariantMap}.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/ayoy/qoauth.git";)
+                    (url "https://github.com/ayoy/qoauth";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1045,7 +1045,7 @@ current version of any major web browser.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/Tencent/rapidjson.git";)
+                    (url "https://github.com/Tencent/rapidjson";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1086,7 +1086,7 @@ style API.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/lloyd/yajl.git";)
+                    (url "https://github.com/lloyd/yajl";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1117,7 +1117,7 @@ parser written in ANSI C and a small validating JSON 
generator.")
               ;; things from Git.
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/warmcat/libwebsockets.git";)
+                    (url "https://github.com/warmcat/libwebsockets";)
                     (commit (string-append "v" version
                                            "-chrome37-firefox30"))))
               (sha256
@@ -1196,7 +1196,7 @@ other systems that want to manipulate WebAssembly files.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/zaphoyd/websocketpp.git";)
+             (url "https://github.com/zaphoyd/websocketpp";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1230,7 +1230,7 @@ high performance.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tatsuhiro-t/wslay.git";)
+             (url "https://github.com/tatsuhiro-t/wslay";)
              (commit (string-append "release-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1406,7 +1406,7 @@ of people.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/novnc/websockify.git";)
+                    (url "https://github.com/novnc/websockify";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1667,7 +1667,7 @@ minimum to provide high performance operation.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sass/libsass.git";)
+                    (url "https://github.com/sass/libsass";)
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1701,7 +1701,7 @@ stylesheets, you'll need to use another program that uses 
this library,
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/sass/sassc.git";)
+                    (url "https://github.com/sass/sassc";)
                     (commit  version)))
               (file-name (git-file-name name version))
               (sha256
@@ -1758,7 +1758,7 @@ language known as SASS.")
            (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/sass/libsass.git";)
+                   (url "https://github.com/sass/libsass";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -5021,7 +5021,7 @@ written in C.  It is developed as part of the NetSurf 
project.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/tlsa/libcyaml.git";)
+             (url "https://github.com/tlsa/libcyaml";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -5747,7 +5747,7 @@ additional capabilities.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/openSUSE/xinetd.git";)
+             (url "https://github.com/openSUSE/xinetd";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -7311,7 +7311,7 @@ compressed JSON header blocks.
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/UMCUGenetics/hpcguix-web.git";)
+                      (url "https://github.com/UMCUGenetics/hpcguix-web";)
                       (commit commit)))
                 (file-name (git-file-name name version))
                 (sha256
diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index 0d772b5..e3bfe8d 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -67,7 +67,7 @@
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/wireservice/leather.git";)
+                   (url "https://github.com/wireservice/leather";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -93,7 +93,7 @@ charts now and don't care if they're perfect.")))
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/wireservice/agate.git";)
+                   (url "https://github.com/wireservice/agate";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -126,7 +126,7 @@ code.  Agate was previously known as journalism.")))
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/wireservice/agate-sql.git";)
+                   (url "https://github.com/wireservice/agate-sql";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -152,7 +152,7 @@ support to all @code{agate.Table} instances.")))
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/wireservice/agate-dbf.git";)
+                   (url "https://github.com/wireservice/agate-dbf";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
@@ -177,7 +177,7 @@ for dbf files support to all @code{agate.Table} 
instances.")))
    (source (origin
              (method git-fetch)
              (uri (git-reference
-                   (url "https://github.com/wireservice/agate-excel.git";)
+                   (url "https://github.com/wireservice/agate-excel";)
                    (commit version)))
              (file-name (git-file-name name version))
              (sha256
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8b54376..2849873 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -121,7 +121,7 @@
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/baskerville/bspwm.git";)
+             (url "https://github.com/baskerville/bspwm";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -403,7 +403,7 @@ Despite the name it should work with any X11 window 
manager.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/vivien/i3blocks.git";)
+                    (url "https://github.com/vivien/i3blocks";)
                     (commit version)))
               (sha256
                (base32
@@ -458,7 +458,7 @@ You can then subscribe to events or send messages and 
receive their replies.")
        ;; for years.
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/ziberna/i3-py.git";)
+             (url "https://github.com/ziberna/i3-py";)
              (commit "27f88a616e9ecc340e7d041d3d00782f8a1964c1")))
        (sha256
         (base32
@@ -503,7 +503,7 @@ subscribe to events.")
          ;; instead of the release.
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/proxypoke/quickswitch-for-i3.git";)
+               (url "https://github.com/proxypoke/quickswitch-for-i3";)
                (commit commit)))
          (sha256
           (base32
@@ -541,7 +541,7 @@ prompt.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/PandorasFox/i3lock-color.git";)
+             (url "https://github.com/PandorasFox/i3lock-color";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -584,7 +584,7 @@ Features include:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/meskarune/i3lock-fancy.git";)
+             (url "https://github.com/meskarune/i3lock-fancy";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1109,7 +1109,7 @@ Keybinder works with GTK-based applications using the X 
Window System.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/conformal/spectrwm.git";)
+             (url "https://github.com/conformal/spectrwm";)
              (commit
               (string-append "SPECTRWM_"
                              (string-join (string-split version #\.) "_")))))
@@ -1317,7 +1317,7 @@ functionality to display information about the most 
commonly used services.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/wlroots.git";)
+             (url "https://github.com/swaywm/wlroots";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1362,7 +1362,7 @@ modules for building a Wayland compositor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/sway.git";)
+             (url "https://github.com/swaywm/sway";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1414,7 +1414,7 @@ modules for building a Wayland compositor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/swayidle.git";)
+             (url "https://github.com/swaywm/swayidle";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1440,7 +1440,7 @@ modules for building a Wayland compositor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/swaylock.git";)
+             (url "https://github.com/swaywm/swaylock";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1468,7 +1468,7 @@ modules for building a Wayland compositor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/swaybg.git";)
+             (url "https://github.com/swaywm/swaybg";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1493,7 +1493,7 @@ modules for building a Wayland compositor.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Alexays/Waybar.git";)
+             (url "https://github.com/Alexays/Waybar";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1531,7 +1531,7 @@ Wlroots based compositors.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/emersion/mako.git";)
+             (url "https://github.com/emersion/mako";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -1559,7 +1559,7 @@ compositors that support the layer-shell protocol.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/stumpwm/stumpwm.git";)
+             (url "https://github.com/stumpwm/stumpwm";)
              (commit version)))
        (file-name (git-file-name "stumpwm" version))
        (sha256
@@ -1669,7 +1669,7 @@ productive, customizable lisp based systems.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/stumpwm/stumpwm-contrib.git";)
+               (url "https://github.com/stumpwm/stumpwm-contrib";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 2cdff17..7141b2f 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -162,7 +162,7 @@ and many other languages.")
             (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/wxWidgets/wxWidgets.git";)
+                    (url "https://github.com/wxWidgets/wxWidgets";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name "wxwidgets" version))
               (sha256
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 6033b40..2308580 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -221,7 +221,7 @@ used to further tweak the behaviour of the different 
profiles.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/Cloudef/bemenu.git";)
+             (url "https://github.com/Cloudef/bemenu";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -265,7 +265,7 @@ with X11 or Wayland, or in a text terminal with ncurses.")
   (source (origin
             (method git-fetch)
             (uri (git-reference
-                   (url "https://github.com/hluk/CopyQ.git";)
+                   (url "https://github.com/hluk/CopyQ";)
                    (commit (string-append "v" version))))
             (file-name (git-file-name name version))
             (sha256
@@ -296,7 +296,7 @@ application.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/astrand/xclip.git";)
+             (url "https://github.com/astrand/xclip";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -633,7 +633,7 @@ move windows, switch between desktops, etc.).")
        (method git-fetch)
        (uri
         (git-reference
-         (url "https://github.com/resurrecting-open-source-projects/scrot.git";)
+         (url "https://github.com/resurrecting-open-source-projects/scrot";)
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -665,7 +665,7 @@ of the screen selected by mouse.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/naelstrof/slop.git";)
+                    (url "https://github.com/naelstrof/slop";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -698,7 +698,7 @@ selection's dimensions to stdout.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/naelstrof/maim.git";)
+                    (url "https://github.com/naelstrof/maim";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1051,7 +1051,7 @@ within a single process.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/alols/xcape.git";)
+                    (url "https://github.com/alols/xcape";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1244,7 +1244,7 @@ color temperature should be set to match the lamps in 
your room.")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
-                      (url "https://github.com/minus7/redshift.git";)
+                      (url "https://github.com/minus7/redshift";)
                       (commit commit)))
                 (file-name (string-append name "-" version))
                 (sha256
@@ -1552,7 +1552,7 @@ actions, a built-in clock, a battery monitor and a system 
tray.")
      (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/robm/dzen.git";)
+                    (url "https://github.com/robm/dzen";)
                     (commit commit)))
               (file-name (string-append name "-" version))
               (sha256
@@ -1722,7 +1722,7 @@ invert colors on a specific display/screen.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dusxmt/nxbelld.git";)
+                    (url "https://github.com/dusxmt/nxbelld";)
                     (commit version)))
               (sha256
                (base32
@@ -1918,7 +1918,7 @@ to automatically turn it on on login.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/zoltanp/xrandr-invert-colors.git";)
+                    (url "https://github.com/zoltanp/xrandr-invert-colors";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -2053,7 +2053,7 @@ binary to setuid-binaries:
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/bugaevc/wl-clipboard.git";)
+             (url "https://github.com/bugaevc/wl-clipboard";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2103,7 +2103,7 @@ The cutbuffer and clipboard selection are always 
synchronized.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/johanmalm/jgmenu.git";)
+             (url "https://github.com/johanmalm/jgmenu";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2222,7 +2222,7 @@ Xwrits hides itself until you should take another break.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/derat/xsettingsd.git";)
+             (url "https://github.com/derat/xsettingsd";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2288,7 +2288,7 @@ configuring visual settings in different UI toolkits 
separately.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/cdown/clipnotify.git";)
+             (url "https://github.com/cdown/clipnotify";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -2339,7 +2339,7 @@ tools to complement clipnotify.")
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://github.com/cdown/clipmenu.git";)
+               (url "https://github.com/cdown/clipmenu";)
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
@@ -2418,7 +2418,7 @@ After selection, the clip is put onto the PRIMARY and 
CLIPBOARD X selections.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/qnikst/kbdd.git";)
+             (url "https://github.com/qnikst/kbdd";)
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -2454,7 +2454,7 @@ create layout indicator widgets.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/enkore/j4-dmenu-desktop.git";)
+                    (url "https://github.com/enkore/j4-dmenu-desktop";)
                     (commit (string-append "r" version))))
               (file-name (git-file-name name version))
               (sha256
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 90181a1..c3a9a1c 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1108,7 +1108,7 @@ C++ programming language.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/leethomason/tinyxml2.git";)
+             (url "https://github.com/leethomason/tinyxml2";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1216,7 +1216,7 @@ elements to their parents
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/dilshod/xlsx2csv.git";)
+             (url "https://github.com/dilshod/xlsx2csv";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
@@ -1628,7 +1628,7 @@ with XPath too.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/elharo/xom.git";)
+                    (url "https://github.com/elharo/xom";)
                     (commit (string-append "XOM_" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1767,7 +1767,7 @@ package is in maintenance mode.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/dom4j/dom4j.git";)
+                    (url "https://github.com/dom4j/dom4j";)
                     (commit (string-append "version-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1840,7 +1840,7 @@ low memory footprint.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/stefanhaustein/kxml2.git";)
+                    (url "https://github.com/stefanhaustein/kxml2";)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1914,7 +1914,7 @@ and from a Java application.  It provides a standard pull 
parser interface.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/codehaus/jettison.git";)
+                    (url "https://github.com/codehaus/jettison";)
                     (commit (string-append "jettison-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1946,7 +1946,7 @@ implements @code{XMLStreamWriter} and 
@code{XMLStreamReader} and supports
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/hunterhacker/jdom.git";)
+                    (url "https://github.com/hunterhacker/jdom";)
                     (commit (string-append "JDOM-" version))))
               (file-name (git-file-name name version))
               (sha256
@@ -1974,7 +1974,7 @@ outputting XML data from Java code.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/x-stream/xstream.git";)
+             (url "https://github.com/x-stream/xstream";)
              (commit (string-append
                       "XSTREAM_"
                       (string-map (lambda (x) (if (eq? x #\.) #\_ x))
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 9b663aa..eef2eb1 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3540,7 +3540,7 @@ X server.")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/mjanusz/v86d.git";)
+             (url "https://github.com/mjanusz/v86d";)
              (commit (string-append name "-" version))))
        (file-name (git-file-name name version))
        (sha256
@@ -6698,7 +6698,7 @@ Thai).")
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/eworm-de/xcur2png.git";)
+             (url "https://github.com/eworm-de/xcur2png";)
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
diff --git a/tests/lint.scm b/tests/lint.scm
index 83becb6..2f5e562 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -611,7 +611,7 @@
                              (origin
                                (method git-fetch)
                                (uri (git-reference
-                                     (url 
"https://github.com/archive/example.git";)
+                                     (url "https://github.com/archive/example";)
                                      (commit "0")))
                                (sha256 %null-sha256))))))
     (check-source-unstable-tarball pkg)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]