From 8bc92d78e7c786c439e977dde0e44c7dceb4ae24 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 24 Apr 2019 21:12:43 -0500
Subject: [PATCH 1/2] lib.licences: Add CC-BY-NC-3.0

---
 lib/licenses.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index d285ba2ea0aa..53a84999bc83 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -145,6 +145,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     free = false;
   };
 
+  cc-by-nc-30 = spdx {
+    spdxId = "CC-BY-NC-3.0";
+    fullName = "Creative Commons Attribution Non Commercial 3.0 Unported";
+    free = false;
+  };
+
   cc-by-nc-40 = spdx {
     spdxId = "CC-BY-NC-4.0";
     fullName = "Creative Commons Attribution Non Commercial 4.0 International";

From 6124bfac3bab543ae309633c790cd29ee52b673e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 24 Apr 2019 21:13:39 -0500
Subject: [PATCH 2/2] xkcd-font: init at 2017-08-24

---
 pkgs/data/fonts/xkcd-font/default.nix | 28 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/data/fonts/xkcd-font/default.nix

diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
new file mode 100644
index 000000000000..9aa664fd2896
--- /dev/null
+++ b/pkgs/data/fonts/xkcd-font/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "xkcd-font";
+  version = "unstable-2017-08-24";
+
+  src = fetchFromGitHub {
+    owner = "ipython";
+    repo = pname;
+    rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
+    sha256 = "01wpfc1yp93b37r472mx2b459il5gywnv5sl7pp9afpycb3i4f6l";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
+    install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The xkcd font";
+    homepage = https://github.com/ipython/xkcd-font;
+    license = licenses.cc-by-nc-30;
+    platforms = platforms.all;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c39fafb320e7..b84f66036420 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16413,6 +16413,8 @@ in
 
   xits-math = callPackage ../data/fonts/xits-math { };
 
+  xkcd-font = callPackage ../data/fonts/xkcd-font { };
+
   xkeyboard_config = xorg.xkeyboardconfig;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;