Merge master into staging-next

doc/languages-frameworks/node.section.md

@@ -14,7 +14,7 @@ project.
 
 The package set also provides support for multiple Node.js versions. The policy
 is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 6.x), unless there is an explicit reason to support
+release (which is currently 8.x), unless there is an explicit reason to support
 a different release.
 
 If your package uses native addons, you need to examine what kind of native
@@ -26,7 +26,7 @@ build system it uses. Here are some examples:
 
 After you have identified the correct system, you need to override your package
 expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
+requires `node-gyp-build`, so we override its expression in `default-v8.nix`:
 
 ```nix
 dat = nodePackages.dat.override (oldAttrs: {
@@ -36,14 +36,14 @@ dat = nodePackages.dat.override (oldAttrs: {
 
 To add a package from NPM to nixpkgs:
 
- 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
-    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
-    for packages depending on Node.js 4.x)
+ 1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
+    or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
+    for packages depending on Node.js 10.x)
  2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
  3. Build your new package to test your changes:
     `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
-    To build against a specific Node.js version (e.g. 4.x):
-    `nix-build -A nodePackages_4_x.<new-or-updated-package>`
+    To build against a specific Node.js version (e.g. 10.x):
+    `nix-build -A nodePackages_10_x.<new-or-updated-package>`
  4. Add and commit all modified and generated files.
 
 For more information about the generation process, consult the

doc/stdenv.xml

@@ -1732,14 +1732,37 @@ set debug-file-directory ~/.nix-profile/lib/debug
        Controls whether the installCheck phase is executed. By default it is
        skipped, but if <varname>doInstallCheck</varname> is set to true, the
        installCheck phase is usually executed. Thus you should set
-<programlisting>doInstallCheck = true;</programlisting>
+       <programlisting>doInstallCheck = true;</programlisting>
        in the derivation to enable install checks. The exception is cross
        compilation. Cross compiled builds never run tests, no matter how
        <varname>doInstallCheck</varname> is set, as the newly-built program
        won't run on the platform used to build it.
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>installCheckTarget</varname>
+     </term>
+     <listitem>
+      <para>
+       The make target that runs the install tests. Defaults to
+       <literal>installcheck</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>
+      <varname>installCheckFlags</varname> / <varname>installCheckFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
+       but only used by the installCheck phase.
+      </para>
+     </listitem>
+    </varlistentry>
     <varlistentry>
      <term>
       <varname>installCheckInputs</varname>

nixos/doc/manual/administration/cleaning-store.xml

@@ -50,4 +50,14 @@ $ nix-store --optimise
   Since this command needs to read the entire Nix store, it can take quite a
   while to finish.
  </para>
+ <section xml:id="sect-nixos-gc-boot-entries">
+  <title>NixOS Boot Entries</title>
+
+  <para>
+   If your <filename>/boot</filename> partition runs out of space, after
+   clearing old profiles you must rebuild your system with
+   <literal>nixos-rebuild</literal> to update the <filename>/boot</filename>
+   partition and clear space.
+  </para>
+ </section>
 </chapter>

pkgs/applications/graphics/drawpile/default.nix

@@ -0,0 +1,44 @@
+{ stdenv
+, fetchurl
+, cmake
+, qtbase
+, qtsvg
+, qtmultimedia
+, qttools
+, kdnssd
+, karchive
+, libsodium
+, libmicrohttpd
+, giflib
+, miniupnpc
+}:
+
+stdenv.mkDerivation rec {
+  name = "drawpile-${version}";
+  version = "2.0.11";
+  src = fetchurl {
+    url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
+    sha256 = "0h018rxhc0lwpqwmlihalz634nd0xaafk4p2b782djjd87irnjpk";
+  };
+  buildInputs = [
+    cmake
+    qtbase qtsvg qtmultimedia qttools
+    karchive
+    # optional deps:
+    libsodium # ext-auth support
+    libmicrohttpd # HTTP admin api
+    giflib # gif animation export support
+    miniupnpc # automatic port forwarding
+    kdnssd # local server discovery with Zeroconf
+  ];
+  configurePhase = "cmake -DCMAKE_INSTALL_PREFIX=$out .";
+
+  meta = with stdenv.lib; {
+    description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously";
+    homepage = https://drawpile.net/;
+    downloadPage = https://drawpile.net/download/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
+

pkgs/applications/misc/mdp/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.13";
+  version = "1.0.14";
   name = "mdp-${version}";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq";
+    sha256 = "1nljb2bkk7kswywvvn3b2k6q14bh2jnwm8cypax3mwssjmid78af";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

pkgs/applications/video/shotcut/default.nix

@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.08";
+  version = "18.08.14";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1p2s4avm3bl5ippmgfzkkbb2w0xs4vhk2wbcd22g7bh1zq9w190n";
+    sha256 = "074df9vc0rdb4byalaarq522vkfq5mrhxs4dgbyqls3ryd3hj1ds";
   };
 
   enableParallelBuilding = true;

pkgs/desktops/deepin/deepin-icon-theme/default.nix

@@ -3,37 +3,32 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "deepin-icon-theme";
-  version = "15.12.52";
+  version = "15.12.59";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l";
-
-    # Get rid of case collision in file names, which is an issue in
-    # darwin where file names are case insensitive.
-    extraPostFetch = ''
-      rm "$out"/Sea/apps/scalable/TeXmacs.svg
-      rm "$out"/deepin/apps/48/TeXmacs.svg
-    ''; 
+    sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq";
   };
 
   nativeBuildInputs = [ gtk3 papirus-icon-theme ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  postPatch = ''
+    patchShebangs .
 
-  postFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
+    # install in $out
+    sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links
+
+    # keep icon-theme.cache
+    sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
   '';
 
   meta = with stdenv.lib; {
-    description = "Deepin icon theme";
+    description = "Icons for the Deepin Desktop Environment";
     homepage = https://github.com/linuxdeepin/deepin-icon-theme;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ romildo ];
   };
 }

pkgs/desktops/deepin/deepin-terminal/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "deepin-terminal-${version}";
-  version = "3.0.0";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = "deepin-terminal";
     rev = version;
-    sha256 = "11f2yc0fj05lwhgvdrbrs8xsdm7qgp6wb5wd1f9iyc5nxn7ccl1r";
+    sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa";
   };
 
   patches = [
@@ -29,15 +29,17 @@ stdenv.mkDerivation rec {
     # For setup hook
     gobjectIntrospection
   ];
+
   buildInputs = [ gtk3 vte libgee wnck librsvg libsecret json-glib ];
 
   meta = with stdenv.lib; {
     description = "The default terminal emulation for Deepin";
     longDescription = ''
       Deepin terminal, it sharpens your focus in the world of command line!
-      It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
+      It is an advanced terminal emulator with workspace, multiple
+      windows, remote management, quake mode and other features.
      '';
-    homepage = https://github.com/linuxdeepin/deepin-terminal/;
+    homepage = https://github.com/linuxdeepin/deepin-terminal;
     license = licenses.gpl3;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux;

pkgs/development/compilers/openjdk/10.nix

@@ -17,8 +17,8 @@ let
       "i386"
     else "amd64";
 
-  update = "10.0.1";
-  build = "10";
+  update = "10.0.2";
+  build = "13";
   repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
 
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
-      sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw";
+      sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk";
     };
 
     outputs = [ "out" "jre" ];

pkgs/development/compilers/openjdk/darwin/10.nix

@@ -7,11 +7,11 @@ let
   };
 
   jdk = stdenv.mkDerivation {
-    name = "zulu10.1+11-jdk10";
+    name = "zulu10.3+5-jdk10";
 
     src = fetchurl {
-      url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip";
-      sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
+      url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
+      sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
     };
 

pkgs/development/libraries/libgpg-error/default.nix

@@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec {
 
   postPatch = ''
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
-  '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) ''
+  '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
     ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
     ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h

pkgs/development/libraries/ti-rpc/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.3";
+  name = "libtirpc-1.1.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6";
+    sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
   };
 
   postPatch = ''