Merge staging-next into staging

2018-12-26 09:30:32 +01:00
parent e5271b72cc 0a1dc96ada
commit e45ca47f14
43 changed files with 264 additions and 176 deletions
@@ -17,7 +17,7 @@
   </listitem>
   <listitem>
    <para>
-     <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
+     <link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
     Nix has been updated to 1.8.</link>
    </para>
   </listitem>
@@ -61,6 +61,8 @@ in
        wantedBy = [ "default.target" ];
      };
    };
+
+    environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
  };

 }