summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/maintainers.nix2
-rw-r--r--pkgs/applications/video/minitube/default.nix3
-rw-r--r--pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch2
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6cfa493353f2..e80fb20929a7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -385,7 +385,7 @@
nand0p = "Fernando Jose Pando <nando@hex7.com>";
Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
- nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
+ nckx = "Tobias Geerinckx-Rice <github@tobias.gr>";
ndowens = "Nathan Owens <ndowens04@gmail.com>";
neeasade = "Nathan Isom <nathanisom27@gmail.com>";
nequissimus = "Tim Steinbach <tim@nequissimus.com>";
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 971588901b46..f70c142ab41d 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
-# "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
+# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
+# account. You'll need to generate (and please share :-) a new one if it breaks.
, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
index 2dd3fcc4ebe9..5f38861bf68b 100644
--- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
+++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
@@ -2,7 +2,7 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown,
which isn't valid on NixOS (and a compatibility link on most other modern
distros anyway).
- -- nckx <tobias.geerinckx.rice@gmail.com>
+ -- nckx <github@tobias.gr>
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -53,7 +53,7 @@