From a3777ba4f959ae7fa10561b953c6e10add125fa8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 23 Oct 2013 20:06:39 +0200
Subject: [PATCH] Remove dependencies on the Nixpkgs location

---
 nixos/modules/services/audio/fuppes.nix        |  5 +++--
 nixos/modules/services/databases/mysql.nix     |  4 ++--
 nixos/modules/services/databases/mysql55.nix   |  4 ++--
 nixos/modules/services/networking/ejabberd.nix |  2 +-
 nixos/modules/services/networking/ssh/sshd.nix |  4 ++--
 nixos/modules/system/boot/loader/grub/grub.nix | 18 +++++++++---------
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix
index df73e62fc942..9c8849e525b3 100644
--- a/nixos/modules/services/audio/fuppes.nix
+++ b/nixos/modules/services/audio/fuppes.nix
@@ -60,8 +60,7 @@ with pkgs.lib;
       };
 
       vfolder = mkOption {
-        default = ./fuppes/vfolder.cfg;
-        example = /etc/fuppes/vfolder.cfg;
+        example = literalExample "/etc/fuppes/vfolder.cfg";
         description = ''
           XML file describing the layout of virtual folder visible by the
           client.
@@ -109,6 +108,8 @@ with pkgs.lib;
 
     services.fuppesd.name = mkDefault config.networking.hostName;
 
+    services.fuppesd.vfolder = mkDefault ./fuppes/vfolder.cfg;
+
     security.sudo.enable = true;
   };
 }
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 663c2cc4505a..8be05a27cdcb 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -93,8 +93,8 @@ in
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
         example = [
-          { name = "foodatabase"; schema = ./foodatabase.sql; }
-          { name = "bardatabase"; schema = ./bardatabase.sql; }
+          { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; }
+          { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; }
         ];
       };
 
diff --git a/nixos/modules/services/databases/mysql55.nix b/nixos/modules/services/databases/mysql55.nix
index 46148d68f4c6..fe8b29e3c6b7 100644
--- a/nixos/modules/services/databases/mysql55.nix
+++ b/nixos/modules/services/databases/mysql55.nix
@@ -86,8 +86,8 @@ in
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
         example = [
-          { name = "foodatabase"; schema = ./foodatabase.sql; }
-          { name = "bardatabase"; schema = ./bardatabase.sql; }
+          { name = "foodatabase"; schema = literalExample "./foodatabase.sql"; }
+          { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; }
         ];
       };
 
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 05e0aba7d70e..75950f55a279 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -44,7 +44,7 @@ in
       loadDumps = mkOption {
         default = [];
         description = "Configuration dump that should be loaded on the first startup";
-        example = [ ./myejabberd.dump ];
+        example = literalExample "[ ./myejabberd.dump ]";
       };
     };
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index c85c9307e3e4..f5670ccdcbfa 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -181,11 +181,11 @@ in
         example = [
           {
             hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-            publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
+            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
           }
           {
             hostNames = [ "myhost2" ];
-            publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
+            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
           }
         ];
         options = {
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 48d16b1c520e..97ea6100d717 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -167,15 +167,7 @@ in
       };
 
       splashImage = mkOption {
-        default =
-          if cfg.version == 1
-          then pkgs.fetchurl {
-            url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
-            sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
-          }
-          # GRUB 1.97 doesn't support gzipped XPMs.
-          else ./winkler-gnu-blue-640x480.png;
-        example = null;
+        example = literalExample "./my-background.png";
         description = ''
           Background image used for GRUB.  It must be a 640x480,
           14-colour image in XPM format, optionally compressed with
@@ -231,6 +223,14 @@ in
 
     boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
 
+    boot.loader.grub.splashImage = mkDefault (
+      if cfg.version == 1 then pkgs.fetchurl {
+        url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
+        sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
+      }
+      # GRUB 1.97 doesn't support gzipped XPMs.
+      else ./winkler-gnu-blue-640x480.png);
+
     system.build.installBootLoader =
       if cfg.devices == [] then
         throw "You must set the ‘boot.loader.grub.device’ option to make the system bootable."