NixOS · Aug 5, 2018 · Aug 16, 2018 · Aug 21, 2018 · Sep 1, 2018 · Sep 1, 2018
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
@@ -60,7 +60,7 @@
 # systemctl start display-manager.service
 </screen>
  </para>
- <simplesect>
+ <simplesect xml:id="sec-x11-graphics-cards-nvidia">
   <title>NVIDIA Graphics Cards</title>
   <para>
    NVIDIA provides a proprietary driver for its graphics cards that has better
@@ -86,7 +86,7 @@
 </programlisting>
   </para>
  </simplesect>
- <simplesect>
+ <simplesect xml:id="sec-x11--graphics-cards-amd">
   <title>AMD Graphics Cards</title>
   <para>
    AMD provides a proprietary driver for its graphics cards that has better 3D
@@ -106,7 +106,7 @@
 </programlisting>
   </para>
  </simplesect>
- <simplesect>
+ <simplesect xml:id="sec-x11-touchpads">
   <title>Touchpads</title>
   <para>
    Support for Synaptics touchpads (found in many laptops such as the Dell
@@ -123,7 +123,7 @@
    since NixOS 17.09.
   </para>
  </simplesect>
- <simplesect>
+ <simplesect xml:id="sec-x11-gtk-and-qt-themes">
   <title>GTK/Qt themes</title>
   <para>
    GTK themes can be installed either to user profile or system-wide (via

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
@@ -31,7 +31,7 @@
   (system wide), put them into your
   <xref linkend="opt-environment.systemPackages"/>.
  </para>
- <simplesect>
+ <simplesect xml:id="sec-xfce-thunar-volumes">
   <title>Thunar Volume Support</title>
   <para>
    To enable <emphasis>Thunar</emphasis> volume support, put
@@ -41,7 +41,7 @@
    into your <emphasis>configuration.nix</emphasis>.
   </para>
  </simplesect>
- <simplesect>
+ <simplesect xml:id="sec-xfce-polkit">
   <title>Polkit Authentication Agent</title>
   <para>
    There is no authentication agent automatically installed alongside Xfce. To
@@ -50,7 +50,7 @@
    and login did the trick.
   </para>
  </simplesect>
- <simplesect>
+ <simplesect xml:id="sec-xfce-troubleshooting">
   <title>Troubleshooting</title>
   <para>
    Even after enabling udisks2, volume management might not work. Thunar and/or

diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
@@ -17,7 +17,7 @@ config = {
   definitions in a <emphasis>property</emphasis> to achieve certain effects:
  </para>
 
- <simplesect>
+ <simplesect xml:id="sec-option-definitions-delaying-conditionals">
   <title>Delaying Conditionals</title>
   <para>
    If a set of option definitions is conditional on the value of another
@@ -59,7 +59,7 @@ config = {
   </para>
  </simplesect>
 
- <simplesect>
+ <simplesect xml:id="sec-option-definitions-setting-priorities">
   <title>Setting Priorities</title>
   <para>
    A module can override the definitions of an option in other modules by
@@ -76,7 +76,7 @@ services.openssh.enable = mkOverride 10 false;
   </para>
  </simplesect>
 
- <simplesect>
+ <simplesect xml:id="sec-option-definitions-merging">
   <title>Merging Configurations</title>
   <para>
    In conjunction with <literal>mkIf</literal>, it is sometimes useful for a

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
@@ -34,6 +34,7 @@ in
 
     environment.variables = mkOption {
       default = {};
+      example = { EDITOR = "nvim"; VISUAL = "nvim"; };
       description = ''
         A set of environment variables used in the global environment.
         These variables will be set on shell initialisation (e.g. in /etc/profile).

diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
@@ -69,7 +69,7 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
   as shown above, and also (after running <literal>nixos-rebuild</literal>) the
   input method must be added from IBus' preference dialog.</para>
 
-<simplesect>
+<simplesect xml:id="module-services-input-methods-troubleshooting">
   <title>Troubleshooting</title>
   <para>If IBus works in some applications but not others, a likely cause of
   this is that IBus is depending on a different version of

diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
@@ -274,7 +274,7 @@ $ ./result/bin/emacs -q
       <para>
         The list of available packages in the various ELPA
         repositories can be seen with the following commands:
-        <example>
+        <example xml:id="module-services-emacs-querying-packages">
           <title>Querying Emacs packages</title>
           <programlisting><![CDATA[
 nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages
@@ -291,7 +291,7 @@ nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
         (see <xref linkend="sec-declarative-package-mgmt" />). Simply
         modify your file <filename>configuration.nix</filename> to
         make it contain:
-        <example>
+        <example xml:id="module-services-emacs-configuration-nix">
           <title>Custom Emacs in <filename>configuration.nix</filename></title>
           <programlisting><![CDATA[
 {
@@ -319,7 +319,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
         Emacs only for yourself, you can do so by adding it to your
         <filename>~/.config/nixpkgs/config.nix</filename>
         (see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
-        <example>
+        <example xml:id="module-services-emacs-config-nix">
           <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
           <programlisting><![CDATA[
 {
@@ -522,7 +522,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
     The Emacs init file should be changed to load the extension
     packages at startup:
 
-    <example>
+    <example xml:id="module-services-emacs-package-initialisation">
       <title>Package initialization in <filename>.emacs</filename></title>
       <programlisting><![CDATA[
 (require 'package)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
@@ -44,7 +44,13 @@ let
   helpScript = pkgs.writeScriptBin "nixos-help"
     ''
       #! ${pkgs.runtimeShell} -e
-      browser="$BROWSER"
+      # Finds first executable browser in a colon-separated list.
+      # (see how xdg-open defines BROWSER)
+      browser="$(
+        IFS=: ; for b in $BROWSER; do
+          [ -n "$(type -P "$b" || true)" ] && echo "$b" && break
+        done
+      )"
       if [ -z "$browser" ]; then
         browser="$(type -P xdg-open || true)"
         if [ -z "$browser" ]; then

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
@@ -8,7 +8,12 @@ let
   addAttributeName = mapAttrs (a: v: v // {
     text = ''
       #### Activation script snippet ${a}:
+      _localstatus=0
       ${v.text}
+
+      if (( _localstatus > 0 )); then
+        printf "Activation script snippet '%s' failed (%s)\n" "${a}" "$_localstatus"
+      fi
     '';
   });
 
@@ -71,7 +76,7 @@ in
             done
 
             _status=0
-            trap "_status=1" ERR
+            trap "_status=1 _localstatus=\$?" ERR
 
             # Ensure a consistent umask.
             umask 0022

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
@@ -11,6 +11,7 @@ let
     let
       vlanIfs = range 1 (length config.virtualisation.vlans);
     in {
+      environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
       virtualisation.vlans = [ 1 2 3 ];
       boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true;
       networking = {
@@ -320,9 +321,14 @@ let
       name = "MACVLAN";
       nodes.router = router;
       nodes.client = { pkgs, ... }: with pkgs.lib; {
+        environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
+          firewall.logReversePathDrops = true; # to debug firewall rules
+          # reverse path filtering rules for the macvlan interface seem
+          # to be incorrect, causing the test to fail. Disable temporarily.
+          firewall.checkReversePath = false;
           firewall.allowPing = true;
           useDHCP = true;
           macvlans.macvlan.interface = "eth1";
@@ -341,9 +347,16 @@ let
           $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
           $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
 
-          # Print diagnosting information
+          # Print lots of diagnostic information
+          $router->log('**********************************************');
           $router->succeed("ip addr >&2");
+          $router->succeed("ip route >&2");
+          $router->execute("iptables-save >&2");
+          $client->log('==============================================');
           $client->succeed("ip addr >&2");
+          $client->succeed("ip route >&2");
+          $client->execute("iptables-save >&2");
+          $client->log('##############################################');
 
           # Test macvlan creates routable ips
           $client->waitUntilSucceeds("ping -c 1 192.168.1.1");

diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
@@ -31,15 +31,15 @@
 , stdenv
 , unzip
 , which
-, writeTextFile
+, runCommand
 , xkeyboard_config
 , zlib
 , makeDesktopItem
 }:
 
 let
   drvName = "android-studio-${channel}-${version}";
-  androidStudio = stdenv.mkDerivation rec {
+  androidStudio = stdenv.mkDerivation {
     name = drvName;
 
     src = fetchurl {
@@ -111,20 +111,18 @@ let
         ]}" \
         --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
         --set FONTCONFIG_FILE ${fontsConf}
-
-        install -Dm644 bin/studio.png $out/share/pixmaps/${drvName}.png
-        ln -s ${desktopItem}/share/applications $out/share/applications
     '';
+  };
 
-    desktopItem = makeDesktopItem rec {
-      name = drvName;
-      exec = pname;
-      icon = drvName;
-      desktopName = "Android Studio";
-      comment = "The official Android IDE";
-      categories = "Development;IDE;";
-    };
-
+  desktopItem = makeDesktopItem {
+    name = drvName;
+    exec = pname;
+    icon = drvName;
+    desktopName = "Android Studio (${channel} channel)";
+    comment = "The official Android IDE";
+    categories = "Development;IDE;";
+    startupNotify = "true";
+    extraEntries="StartupWMClass=jetbrains-studio";
   };
 
   # Android Studio downloads prebuilt binaries as part of the SDK. These tools
@@ -134,39 +132,35 @@ let
     name = "${drvName}-fhs-env";
     multiPkgs = pkgs: [ pkgs.ncurses5 ];
   };
-
-  wrapper = writeTextFile {
-    name = "${drvName}-wrapper";
-    # TODO: Rename preview -> beta (and add -stable suffix?):
-    destination = "/bin/${pname}";
-    executable = true;
-    text = ''
+in runCommand
+  "${drvName}-wrapper"
+  {
+    startScript = ''
       #!${bash}/bin/bash
       ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh
     '';
-  };
-in stdenv.mkDerivation {
-  name = "${drvName}-with-desktop-item";
-
-  buildCommand = ''
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+    meta = with stdenv.lib; {
+      description = "The Official IDE for Android (${channel} channel)";
+      longDescription = ''
+        Android Studio is the official IDE for Android app development, based on
+        IntelliJ IDEA.
+      '';
+      homepage = if channel == "stable"
+        then https://developer.android.com/studio/index.html
+        else https://developer.android.com/studio/preview/index.html;
+      license = licenses.asl20;
+      platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ primeos ];
+    };
+  }
+  ''
     mkdir -p $out/{bin,share/pixmaps}
-    ln -s ${wrapper}/bin/${pname} $out/bin/${pname}
-
-    ln -s ${androidStudio}/share/pixmaps/${drvName}.png $out/share/pixmaps/${drvName}.png
-    ln -s ${androidStudio}/share/applications $out/share/applications
-  '';
 
-  meta = with stdenv.lib; {
-    description = "The Official IDE for Android (${channel} channel)";
-    longDescription = ''
-      Android Studio is the official IDE for Android app development, based on
-      IntelliJ IDEA.
-    '';
-    homepage = if channel == "stable"
-      then https://developer.android.com/studio/index.html
-      else https://developer.android.com/studio/preview/index.html;
-    license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ primeos ];
-  };
-}
+    # TODO: Rename preview -> beta (and add -stable suffix?):
+    echo -n "$startScript" > $out/bin/${pname}
+    chmod +x $out/bin/${pname}
+    ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png
+    ln -s ${desktopItem}/share/applications $out/share/applications
+  ''
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
@@ -1,31 +1,43 @@
-{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor-icon-theme, wrapGAppsHook } :
+{ stdenv, fetchFromGitHub, fetchpatch, gnome3, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }:
 
 let
-  version = "2.2";
+  version = "2.3";
 in stdenv.mkDerivation {
   name = "gcolor3-${version}";
 
   src = fetchFromGitHub {
     owner = "hjdskes";
     repo = "gcolor3";
     rev = "v${version}";
-    sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
+    sha256 = "186j72kwsqdcakvdik9jl18gz3csdj53j3ylwagr9gfwmy0nmyjb";
   };
 
-  nativeBuildInputs = [ gnome3.gnome-common libtool intltool pkgconfig hicolor-icon-theme wrapGAppsHook ];
+  patches = [
+    # Fix darwin build
+    (fetchpatch {
+      url = https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd.patch;
+      sha256 = "1kn5hx536wivafb4awg7lsa8h32njy0lynmn7ci9y78dlp54057r";
+    })
+    (fetchpatch {
+      url = https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3.patch;
+      sha256 = "1ldyr84dl2g6anqkp2mpxsrcr41fcqwi6ck14rfhai7rgrm8yar3";
+    })
+  ];
 
-  buildInputs = [ gtk3 ];
+  nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ];
 
-  configureScript = "./autogen.sh";
+  buildInputs = [ gtk3 hicolor-icon-theme ];
 
-  # clang-4.0: error: argument unused during compilation: '-pthread'
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
+  postPatch = ''
+    chmod +x meson_install.sh # patchShebangs requires executable file
+    patchShebangs meson_install.sh
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A simple color chooser written in GTK3";
     homepage = https://hjdskes.github.io/projects/gcolor3/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jtojnar ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
   };
 }