Subject: fish-guix + python-pycanberra URL updates, mailmap update

From: ng0 <[email-masked]>
Date: Fri, 24 Nov 2017 14:43:13 +0000

mailmap.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://d.n0.is/dist/keys/
  WWW: https://n0.is
From 4105e9f06800a48b305e5e67763b0541fad540fc Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Fri, 24 Nov 2017 14:32:00 +0000
Subject: [PATCH 1/3] gnu: python-pycanberra: Switch to new download URL.

* gnu/packages/libcanberra.scm (python-pycanberra)[source]: Use new URL.
---
 gnu/packages/libcanberra.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 9af6b40ff..42456995b 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -139,8 +139,8 @@ sounds for various system events.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://dist.ng0.infotropique.org/releases/"
-                           "pycanberra/pycanberra-" version ".tar.xz"))
+       (uri (string-append "https://d.n0.is/releases/pycanberra/"
+                           "pycanberra-" version ".tar.xz"))
        (sha256
         (base32
          "16jjf8fcgaprmz6jacsxrh17l1ad891fns38bxv49lg3s3mn1nj2"))))
@@ -152,5 +152,5 @@ sounds for various system events.")
     (synopsis "Ctypes wrapper for the libcanberra API")
     (description
      "Pycanberra is a basic Python wrapper for libcanberra.")
-    (home-page "https://git.ng0.infotropique.org/pycanberra/")
+    (home-page "https://c.n0.is/pycanberra/")
     (license lgpl2.1+)))
-- 
2.15.0

From ed9b72a1a8d0dcb18310ab5e4b63edb0a91e9fad Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Fri, 24 Nov 2017 14:34:36 +0000
Subject: [PATCH 2/3] gnu: fish-guix: Use new URL.

* gnu/packages/shells.scm (fish-guix)[source]: Use new URL.
(home-page): Use new URL.
---
 gnu/packages/shells.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 2792b2e28..7ea521a08 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -153,7 +153,7 @@ highlighting.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://dist.infotropique.org/fish-guix/"
+       (uri (string-append "https://d.n0.is/releases/fish-guix/"
                            name "-" version ".tar.xz"))
        (sha256
         (base32
@@ -166,7 +166,7 @@ highlighting.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)))) ; No configure script.
-    (home-page "https://www.infotropique.org/projects/fish-guix/")
+    (home-page "https://n0.is/s/fish-guix/")
     (synopsis "Fish completions for Guix")
     (description
      "Fish-guix provides completions for Guix for users of the fish shell.")
-- 
2.15.0

From 050e0bcdf16ab5cbccc56a47cc1a9a4e1848f4f4 Mon Sep 17 00:00:00 2001
From: ng0 <[email-masked]>
Date: Fri, 24 Nov 2017 14:38:38 +0000
Subject: [PATCH 3/3] mailmap update for ng0.

---
 .mailmap | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.mailmap b/.mailmap
index 49c266bf7..e32a3dfb9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -42,16 +42,17 @@ Mathieu Lirzin <[email-masked]> <[email-masked]>
 Mathieu Lirzin <[email-masked]> <[email-masked]>
 Mathieu Othacehe <[email-masked]>
 Nikita Karetnikov <[email-masked]> <[email-masked]>
-ng0 <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
-ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
+ng0 <[email-masked]> <[email-masked]>
 Pjotr Prins <[email-masked]> <[email-masked]>
 Pjotr Prins <[email-masked]> <[email-masked]>
 Pjotr Prins <[email-masked]> <pjotr.public12@email>
-- 
2.15.0