NixOS
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,20 @@
+# CODEOWNERS file
+#
+# This file is used to describe who owns what in this repository. This file does not
+# replace `meta.maintainers` but is instead used for other things than derivations
+# and modules, like documentation, package sets, and other assets.
+#
+# For documentation on this file, see https://help.github.com/articles/about-codeowners/
+# Mentioned users will get code review requests.
+
+# Python-related code and docs
+pkgs/top-level/python-packages.nix	@FRidh
+pkgs/development/interpreters/python/*	@FRidh
+pkgs/development/python-modules/*	@FRidh
+doc/languages-frameworks/python.md	@FRidh
+
+# Darwin-related
+pkgs/stdenv/darwin/*    @copumpkin @LnL7
+pkgs/os-specific/darwin/*   @LnL7
+pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+
diff --git a/.mention-bot b/.mention-bot
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
@@ -366,15 +366,33 @@ it. Place the resulting <filename>package.nix</filename> file into
 
 </section>
 
-<section xml:id="sec-autojump">
+<section xml:id="sec-shell-helpers">
 
-<title>Autojump</title>
+<title>Interactive shell helpers</title>
 
 <para>
-  autojump needs the shell integration to be useful but unlike other systems,
-  nix doesn't have a standard share directory location. This is why a
-  <command>autojump-share</command> script is shipped that prints the location
-  of the shared folder. This can then be used in the .bashrc like this:
+  Some packages provide the shell integration to be more useful. But
+  unlike other systems, nix doesn't have a standard share directory
+  location. This is why a bunch <command>PACKAGE-share</command>
+  scripts are shipped that print the location of the corresponding
+  shared folder.
+
+  Current list of such packages is as following:
+
+  <itemizedlist>
+    <listitem>
+      <para>
+        <literal>autojump</literal>: <command>autojump-share</command>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <literal>fzf</literal>: <command>fzf-share</command>
+      </para>
+    </listitem>
+  </itemizedlist>
+
+  E.g. <literal>autojump</literal> can then used in the .bashrc like this:
 <screen>
   source "$(autojump-share)/autojump.bash"
 </screen>

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
@@ -20,12 +20,35 @@ in
 
   options = {
 
+    networking.fqdn = lib.mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      example = "foo.example.com";
+      description = ''
+        Fully qualified domain name, if any.
+      '';
+    };
+
+    networking.hosts = lib.mkOption {
+      type = types.attrsOf ( types.listOf types.str );
+      default = {};
+      example = literalExample ''
+        {
+          "127.0.0.1" = [ "foo.bar.baz" ];
+          "192.168.0.2" = [ "fileserver.local" "nameserver.local" ];
+        };
+      '';
+      description = ''
+        Locally defined maps of hostnames to IP addresses.
+      '';
+    };
+
     networking.extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";
       description = ''
-        Additional entries to be appended to <filename>/etc/hosts</filename>.
+        Additional verbatim entries to be appended to <filename>/etc/hosts</filename>.
       '';
     };
 
@@ -176,6 +199,9 @@ in
 
   config = {
 
+    warnings = optional (cfg.extraHosts != "")
+      "networking.extraHosts is deprecated, please use networking.hosts instead";
+
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
         "services".source = pkgs.iana-etc + "/etc/services";
@@ -188,11 +214,23 @@ in
 
         # /etc/hosts: Hostname-to-IP mappings.
         "hosts".text =
+          let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
+              allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
+              userLocalHosts = optionalString
+                ( builtins.hasAttr "127.0.0.1" cfg.hosts )
+                ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
+              userLocalHosts6 = optionalString
+                ( builtins.hasAttr "::1" cfg.hosts )
+                ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
+              otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
+              maybeFQDN = optionalString ( cfg.fqdn != null ) cfg.fqdn;
+          in
           ''
-            127.0.0.1 localhost
+            127.0.0.1 ${maybeFQDN} ${userLocalHosts} localhost
             ${optionalString cfg.enableIPv6 ''
-              ::1 localhost
+              ::1 ${maybeFQDN} ${userLocalHosts6} localhost
             ''}
+            ${otherHosts}
             ${cfg.extraHosts}
           '';
 

diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
@@ -3,7 +3,12 @@
 with lib;
 
 let
-  cfg = config.programs.thefuck;
+  prg = config.programs;
+  cfg = prg.thefuck;
+
+  initScript = ''
+    eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+  '';
 in
   {
     options = {
@@ -24,8 +29,11 @@ in
 
     config = mkIf cfg.enable {
       environment.systemPackages = with pkgs; [ thefuck ];
-      environment.shellInit = ''
-        eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+      environment.shellInit = initScript;
+
+      programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
+      programs.fish.shellInit = mkIf prg.fish.enable ''
+        ${pkgs.thefuck}/bin/thefuck --alias | source
       '';
     };
   }
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
@@ -267,7 +267,7 @@ let
       lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ];
     in concatStringsSep "\n" lines;
 
-  in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n";
+  in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf;
 
   headerCheckOptions = { ... }:
   {
@@ -839,5 +839,8 @@ in
     (mkIf (cfg.extraConfig != "") {
       warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
     })
+    (mkIf (cfg.extraMasterConf != "") {
+      warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
+    })
   ]);
 }
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
@@ -131,7 +131,7 @@ in
       (flip mapAttrsToList cfg.networks (network: data:
         flip mapAttrs' data.hosts (host: text: nameValuePair
           ("tinc/${network}/hosts/${host}")
-          ({ mode = "0444"; inherit text; })
+          ({ mode = "0644"; user = "tinc.${network}"; inherit text; })
         ) // {
           "tinc/${network}/tinc.conf" = {
             mode = "0444";

diff --git a/pkgs/applications/altcoins/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
@@ -0,0 +1,24 @@
+{ lib, python2}:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "cryptop";
+  version = "0.1.0";
+  name = "${pname}-${version}";
+
+  src = python2.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
+  };
+
+  propagatedBuildInputs = [ python2.pkgs.requests ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    homepage = "http://github.com/huwwp/cryptop";
+    description = "Command line Cryptocurrency Portfolio";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ bhipple ];
+  };
+}
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
@@ -34,7 +34,7 @@
 
 let
   androidStudio = stdenv.mkDerivation {
-    inherit src meta;
+    inherit src;
     name = "${pname}";
     buildInputs = [
       makeWrapper
@@ -103,12 +103,13 @@ let
     name = "${pname}-fhs-env";
   };
 
-in writeTextFile {
-  name = "${pname}-${version}";
-  destination = "/bin/${pname}";
-  executable = true;
-  text = ''
-    #!${bash}/bin/bash
-    ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
-  '';
-}
+in
+  writeTextFile {
+    name = "${pname}-${version}";
+    destination = "/bin/${pname}";
+    executable = true;
+    text = ''
+      #!${bash}/bin/bash
+      ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
+    '';
+  } // { inherit meta; }
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
@@ -13,7 +13,11 @@ in rec {
     };
 
     meta = with stdenv.lib; {
-      description = "The Official IDE for Android";
+      description = "The Official IDE for Android (stable version)";
+      longDescription = ''
+        Android Studio is the official IDE for Android app development, based on
+        IntelliJ IDEA.
+      '';
       homepage = https://developer.android.com/studio/index.html;
       license = licenses.asl20;
       platforms = [ "x86_64-linux" ];
@@ -36,8 +40,9 @@ in rec {
     };
 
     meta = stable.meta // {
+      description = "The Official IDE for Android (preview version)";
       homepage = https://developer.android.com/studio/preview/index.html;
-      maintainers = with stdenv.lib.maintainers; [ tomsmeets ];
+      maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
     };
   } {
     fontsConf = makeFontsConf {

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
		WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' )