Merge pull request #64236 from NixOS/staging-next

Staging next
2019-07-10 08:52:04 +02:00
parent d2c3c1f2bb 74c24385cb
commit fb6260fcf7
203 changed files with 5311 additions and 3760 deletions
--- a/pkgs/tools/archivers/unp/default.nix
+++ b/pkgs/tools/archivers/unp/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
    name = "unp_2.0_pre7+nmu1.tar.bz2";
  };

-  configurePhase = "true";
+  dontConfigure = true;
  buildPhase = "true";
  installPhase = ''
  mkdir -p $out/bin
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -3,16 +3,18 @@
 let
  # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
  Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
-    name = "Mojolicious-6.46";
+    pname = "Mojolicious";
+    version = "6.46";
    src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz";
      sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr";
    };
  };
  MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec {
-    name = "Mojo-IOLoop-ForkCall-0.17";
+    pname = "Mojo-IOLoop-ForkCall";
+    version = "0.17";
    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
+      url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz";
      sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8";
    };
    propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ];
--- a/pkgs/tools/compression/bzip2/cve-2019-12900.patch
+++ b/pkgs/tools/compression/bzip2/cve-2019-12900.patch
@@ -0,0 +1,13 @@
+https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d
+diff --git a/decompress.c b/decompress.c
+--- a/decompress.c
+++ b/decompress.c
+@@ -287,7 +287,7 @@
+       GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
+       if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
+       GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
+-      if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
+      if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR);
+       for (i = 0; i < nSelectors; i++) {
+          j = 0;
+          while (True) {
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {

  patches = [
    ./CVE-2016-3189.patch
+    ./cve-2019-12900.patch
  ];

  postPatch = ''
--- a/pkgs/tools/compression/mozlz4a/default.nix
+++ b/pkgs/tools/compression/mozlz4a/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
    sha256 = "1d1ai062kdms34bya9dlykkx011rj8d8nh5l7d76xj8k9kv4ssq6";
  };

-  unpackPhase = "true;";
+  dontUnpack = true;

  installPhase = ''
    mkdir -p "$out/bin" "$out/${python3.sitePackages}/"
--- a/pkgs/tools/filesystems/file-rename/default.nix
+++ b/pkgs/tools/filesystems/file-rename/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, perlPackages, makeWrapper }:

-perlPackages.buildPerlPackage rec {
-  name = "File-Rename-0.20";
+perlPackages.buildPerlPackage {
+  pname = "File-Rename";
+  version = "0.20";

  src = fetchurl {
-    url = "mirror://cpan/authors/id/R/RM/RMBARKER/${name}.tar.gz";
+    url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz;
    sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy";
  };

--- a/pkgs/tools/graphics/eplot/default.nix
+++ b/pkgs/tools/graphics/eplot/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ ruby ];

-  unpackPhase = "true";
+  dontUnpack = true;

  installPhase = ''
    mkdir -p "$out/bin"
--- a/pkgs/tools/graphics/feedgnuplot/default.nix
+++ b/pkgs/tools/graphics/feedgnuplot/default.nix
@@ -9,7 +9,7 @@ let
 in

 perlPackages.buildPerlPackage rec {
-  name = "feedgnuplot-${version}";
+  pname = "feedgnuplot";
  version = "1.51";

  src = fetchFromGitHub {
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ libX11 libGL ];

-  configurePhase = "true";
+  dontConfigure = true;

  buildPhase = "
    $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11
--- a/pkgs/tools/graphics/graph-easy/default.nix
+++ b/pkgs/tools/graphics/graph-easy/default.nix
@@ -1,10 +1,10 @@
 { stdenv, perlPackages, fetchurl }:

-perlPackages.buildPerlPackage rec {
-  name = "Graph-Easy-${version}";
+perlPackages.buildPerlPackage {
+  pname = "Graph-Easy";
  version = "0.76";
  src = fetchurl {
-    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+    url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Graph-Easy-0.76.tar.gz";
    sha256 = "d4a2c10aebef663b598ea37f3aa3e3b752acf1fbbb961232c3dbe1155008d1fa";
  };

--- a/pkgs/tools/graphics/grim/default.nix
+++ b/pkgs/tools/graphics/grim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, wayland-protocols }:
+{ stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }:

 stdenv.mkDerivation rec {
  pname = "grim";
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
    meson
    ninja
    pkgconfig
+    scdoc
  ];

  buildInputs = [
--- a/pkgs/tools/graphics/rocket/default.nix
+++ b/pkgs/tools/graphics/rocket/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ qmake ];
  buildInputs = [ qtbase ];

-  configurePhase = ":";
+  dontConfigure = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/tools/graphics/zxing/default.nix
+++ b/pkgs/tools/graphics/zxing/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq";
  };
  inherit jre;
-  unpackPhase = ''true'';
+  dontUnpack = true;
  installPhase = ''
    mkdir -p "$out/lib/java" "$out/bin"
    cp "${core_jar}" "${javase_jar}" "$out/lib/java"
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -33,7 +33,7 @@ let
  };
  emojiData = stdenv.mkDerivation {
    name = "emoji-data-5.0";
-    unpackPhase = ":";
+    dontUnpack = true;
    installPhase = ''
      mkdir $out
      ${builtins.toString (flip mapAttrsToList emojiSrcs (k: v: "cp ${v} $out/emoji-${k}.txt;"))}
@@ -62,7 +62,7 @@ let
  };
  ucd = stdenv.mkDerivation rec {
    name = "ucd-12.0.0";
-    unpackPhase = ":";
+    dontUnpack = true;
    installPhase = ''
      mkdir $out
      ${builtins.toString (flip mapAttrsToList ucdSrcs (k: v: "cp ${v} $out/${k}.txt;"))}
--- a/pkgs/tools/misc/graylog/plugins.nix
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -14,7 +14,7 @@ let
  }:
    stdenv.mkDerivation (a // {
      inherit installPhase;
-      unpackPhase = "true";
+      dontUnpack = true;
      buildInputs = [ unzip ];
      meta = a.meta // {
        platforms = graylog.meta.platforms;
--- a/pkgs/tools/misc/hdfjava/default.nix
+++ b/pkgs/tools/misc/hdfjava/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ cmake javac ];

-  configurePhase = "true";
+  dontConfigure = true;
  buildPhase = "./build-hdfjava-unix.sh";
  installPhase = ''
    mkdir -p $out
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
  inherit src;

  buildInputs = [ dpkg ];
-  unpackPhase = "true";
+  dontUnpack = true;

  buildCommand = ''
    IFS=$'\n'
--- a/pkgs/tools/misc/rename/default.nix
+++ b/pkgs/tools/misc/rename/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages }:

 perlPackages.buildPerlPackage rec {
-  name = "rename-${version}";
+  pname = "rename";
  version = "1.9";
  outputs = [ "out" ];
  src = fetchFromGitHub {
--- a/pkgs/tools/misc/shelldap/default.nix
+++ b/pkgs/tools/misc/shelldap/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perlPackages }:
 perlPackages.buildPerlPackage rec {
-  name = "shelldap-${version}";
+  pname = "shelldap";
  version = "1.4.0";
  src = fetchurl {
    url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
--- a/pkgs/tools/misc/wl-clipboard/default.nix
+++ b/pkgs/tools/misc/wl-clipboard/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
  buildInputs = [ wayland ];
-  mesonFlags = [ "-Dauto_features=enabled" ];

  meta = with stdenv.lib; {
    description = "Command-line copy/paste utilities for Wayland";
--- a/pkgs/tools/misc/woof/default.nix
+++ b/pkgs/tools/misc/woof/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
  version = "2012-05-31";
  name = "woof-${version}";
-  
+
  src = fetchurl {
    url = "http://www.home.unix-ag.org/simon/woof-${version}.py";
    sha256 = "d84353d07f768321a1921a67193510bf292cf0213295e8c7689176f32e945572";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  buildInputs = [ python ];

-  unpackPhase = "true";
+  dontUnpack = true;

  installPhase =
    ''
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/pkgs/tools/misc/x11idle/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {

  buildInputs = [ libXScrnSaver libX11 ];

-  unpackPhase = ":";
+  dontUnpack = true;

  installPhase = ''
    mkdir -p $out/bin
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, iproute, perl }:

 perlPackages.buildPerlPackage rec {
-  name = "ddclient-${version}";
+  pname = "ddclient";
  version = "3.9.0";

  src = fetchurl {
-    url = "mirror://sourceforge/ddclient/${name}.tar.gz";
+    url = "mirror://sourceforge/ddclient/${pname}-${version}.tar.gz";
    sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw";
  };

--- a/pkgs/tools/networking/nuttcp/default.nix
+++ b/pkgs/tools/networking/nuttcp/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    sha256 = "1yang94mcdqg362qbi85b63746hk6gczxrk619hyj91v5763n4vx";
  };

-  unpackPhase = ":";
+  dontUnpack = true;

  buildPhase = ''
    cc -O2 -o nuttcp $src
--- a/pkgs/tools/networking/quickserve/default.nix
+++ b/pkgs/tools/networking/quickserve/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
  pname = "quickserve";
  version = "2018";

-  unpackPhase = ":";
+  dontUnpack = true;
  nativeBuildInputs = [ makeWrapper ];

  installPhase = ''
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "unbound-${version}";
-  version = "1.9.1";
+  version = "1.9.2";

  src = fetchurl {
    url = "https://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1iarvk0i92asvrkpla9z55aan20k6pklzpck9yk4rfnchsdvzh63";
+    sha256 = "15bbrczibap30db8a1pmqhvjbmkxms39hwiivby7f4j5rz2wwykg";
  };

  outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
--- a/pkgs/tools/networking/wrk2/default.nix
+++ b/pkgs/tools/networking/wrk2/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
      --replace 'struct luaL_reg ' 'struct luaL_Reg '
  '';

-  configurePhase = ":";
+  dontConfigure = true;
  installPhase = ''
    mkdir -p $out/bin
    mv ./wrk $out/bin/wrk2
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -8,7 +8,7 @@ let mkPrefetchScript = tool: src: deps:

    nativeBuildInputs = [ makeWrapper ];

-    unpackPhase = ":";
+    dontUnpack = true;

    installPhase = ''
      install -vD ${src} $out/bin/$name;
--- a/pkgs/tools/system/awstats/default.nix
+++ b/pkgs/tools/system/awstats/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perlPackages, jdk }:

 perlPackages.buildPerlPackage rec {
-  name = "awstats-${version}";
+  pname = "awstats";
  version = "7.7";

  src = fetchurl {
-    url = "mirror://sourceforge/awstats/${name}.tar.gz";
+    url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
    sha256 = "0z3p77jnpjilajs9yv87r8xla2x1gjqlvrhpbgbh5ih73386v3j2";
  };

--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -4,8 +4,8 @@ let
  biberSource = stdenv.lib.head (builtins.filter (p: p.tlType == "source") texlive.biber.pkgs);
 in

-perlPackages.buildPerlModule rec {
-  name = "biber-${version}";
+perlPackages.buildPerlModule {
+  pname = "biber";
  inherit (biberSource) version;

  src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -285,7 +285,8 @@ dvipng = stdenv.mkDerivation {


 latexindent = perlPackages.buildPerlPackage rec {
-  inherit (src) name version;
+  pname = "latexindent";
+  inherit (src) version;

  src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.latexindent.pkgs);

--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "12q167pbpxw38p1bzcy9z4ix7yh9giwkyrc4vq2qln3pjn9d31rj";
  };

-  unpackPhase = ":";
+  dontUnpack = true;

  installPhase =
    ''
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -2,7 +2,7 @@

 stdenv.mkDerivation {
  name = "aws-1.75";
-  
+
  src = fetchurl {
    url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws;
    sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {

  buildInputs = [ perl ];

-  unpackPhase = "true";
+  dontUnpack = true;

  installPhase =
    ''
--- a/pkgs/tools/virtualization/linode-cli/default.nix
+++ b/pkgs/tools/virtualization/linode-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, perlPackages, makeWrapper}:

 perlPackages.buildPerlPackage rec {
-  name = "linode-cli-${version}";
+  pname = "linode-cli";
  version = "1.4.7";

  src = fetchFromGitHub {