Merge pull request #114989 from SuperSandro2000/fix-collection20

pkgs/applications/office/calligra/default.nix

@@ -1,15 +1,14 @@
-{
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools
-  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+, boost, qtwebkit, qtx11extras, shared-mime-info
-  boost, qtwebkit, qtx11extras, shared-mime-info,
+, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
-  breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
+, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
-  kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
+, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross
-  kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross,
+, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons
-  knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
+, kwindowsystem, kxmlgui, sonnet, threadweaver
-  kwindowsystem, kxmlgui, sonnet, threadweaver,
+, kcontacts, akonadi, akonadi-calendar, akonadi-contacts
-  kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
+, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen
-  eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
+, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon
-  librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
+, poppler, pstoedit, qca-qt5, vc
-  poppler, pstoedit, qca-qt5, vc
 # TODO: package Spnav, m2mml LibEtonyek, Libqgit2
 }:
 

pkgs/applications/virtualization/aqemu/default.nix

@@ -22,5 +22,6 @@ mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ hrdinka ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }

pkgs/applications/virtualization/qemu/default.nix

@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
     ++ optionals libiscsiSupport [ libiscsi ]
     ++ optionals smbdSupport [ samba ];
 
-  enableParallelBuilding = true;
   dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build
 
   outputs = [ "out" "ga" ];

pkgs/applications/virtualization/qtemu/default.nix

@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }:
+{ lib, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu }:
 
 mkDerivation rec {
   pname = "qtemu";

pkgs/data/fonts/noto-fonts/default.nix

@@ -4,7 +4,6 @@
 , fetchFromGitHub
 , fetchurl
 , fetchzip
-, optipng
 , cairo
 , python3
 , pkg-config

pkgs/data/fonts/noto-fonts/tools.nix

@@ -1,6 +1,6 @@
 { fetchFromGitHub, lib, buildPythonPackage, pythonOlder
 , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click
-, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml
+, defcon, fontmath, fontparts, fontpens, fonttools, lxml
 , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour
 , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli
 , pillow, six, bash, setuptools_scm }:

pkgs/development/compilers/crystal2nix/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }:
+{ lib, fetchFromGitHub, crystal, makeWrapper, nix-prefetch-git }:
 
 crystal.buildCrystalPackage rec {
   pname = "crystal2nix";

pkgs/development/libraries/libnixxml/default.nix

@@ -1,25 +1,31 @@
 { fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config, libxml2, gd, glib, getopt, libxslt, nix }:
 
 stdenv.mkDerivation {
-  name = "libnixxml";
+  pname = "libnixxml";
+  version = "unstable-2020-06-25";
+
   src = fetchFromGitHub {
     owner = "svanderburg";
     repo = "libnixxml";
     rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a";
     sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ=";
   };
-  configureFlags = [ "--with-gd" "--with-glib" ];
+
-  CFLAGS = "-Wall";
+  preConfigure = ''
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ pkg-config libxml2 gd.dev glib getopt libxslt nix ];
-  doCheck = false;
-  postPatch = ''
     ./bootstrap
   '';
 
+  configureFlags = [ "--with-gd" "--with-glib" ];
+  CFLAGS = "-Wall";
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  buildInputs = [ libxml2 gd.dev glib getopt libxslt nix ];
+
+  doCheck = false;
+
   meta = with lib; {
     description = "XML-based Nix-friendly data integration library";
-    homepage = https://github.com/svanderburg/libnixxml;
+    homepage = "https://github.com/svanderburg/libnixxml";
     license = licenses.mit;
     maintainers = with maintainers; [ tomberek ];
     platforms = platforms.unix;

pkgs/development/libraries/serf/default.nix

@@ -2,10 +2,11 @@
 , pkg-config, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "serf-1.3.9";
+  pname = "serf";
+  version = "1.3.9";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/serf/${name}.tar.bz2";
+    url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2";
     sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 

pkgs/development/python-modules/cot/default.nix

@@ -1,13 +1,12 @@
 { lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k
-, argcomplete, colorlog, pyvmomi, requests, verboselogs
+, colorlog, pyvmomi, requests, verboselogs
 , psutil, pyopenssl, setuptools
-, mock, pytest, pytest-mock, pytestCheckHook, qemu
+, mock, pytest-mock, pytestCheckHook, qemu
 }:
 
 buildPythonPackage rec {
   pname = "cot";
   version = "2.2.1";
-
   disabled = !isPy3k;
 
   src = fetchPypi {

pkgs/development/python-modules/gradient_statsd/default.nix

@@ -1,5 +1,5 @@
 { lib, fetchPypi, buildPythonPackage
-, boto3, requests, datadog, configparser, python
+, requests, datadog, configparser, python
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/pysvn/default.nix

@@ -23,7 +23,7 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "http://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
+    url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz";
     sha256 = "sRPa4wNyjDmGdF1gTOgLS0pnrdyZwkkH4/9UCdh/R9Q=";
   };
 
@@ -79,5 +79,7 @@ buildPythonPackage rec {
     description = "Python bindings for Subversion";
     homepage = "http://pysvn.tigris.org/";
     license = licenses.asl20;
+    # g++: command not found
+    broken = stdenv.isDarwin;
   };
 }

pkgs/development/python-modules/w3lib/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , six
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -14,7 +14,14 @@ buildPythonPackage rec {
     sha256 = "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha";
   };
 
-  buildInputs = [ six pytest ];
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "w3lib" ];
+
+  disabledTests = [
+    "test_add_or_replace_parameter"
+  ];
 
   meta = with lib; {
     description = "A library of web-related functions";
@@ -22,5 +29,4 @@ buildPythonPackage rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ drewkett ];
   };
-
 }

pkgs/development/tools/vagrant/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive
-, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch
+, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux
 }:
 
 let

pkgs/tools/filesystems/lizardfs/default.nix

@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
@@ -45,5 +46,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl3;
     maintainers = with maintainers; [ rushmorem shamilton ];
+    # 'fprintf' was not declared in this scope
+    broken = true;
   };
 }

pkgs/tools/filesystems/squashfs/default.nix

@@ -1,19 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, zlib, xz
+{ lib
+, stdenv
+, fetchFromGitHub
+, zlib
+, xz
 , lz4
 , lzo
 , zstd
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "squashfs";
   version = "4.4";
 
   src = fetchFromGitHub {
     owner = "plougher";
     repo = "squashfs-tools";
+    rev = version;
     sha256 = "0697fv8n6739mcyn57jclzwwbbqwpvjdfkv1qh9s56lvyqnplwaw";
-    # Tag "4.4" points to this commit.
-    rev = "52eb4c279cd283ed9802dd1ceb686560b22ffb67";
   };
 
   patches = [
@@ -28,17 +31,24 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib xz zstd lz4 lzo ];
 
-  preBuild = "cd squashfs-tools";
+  preBuild = ''
+    cd squashfs-tools
+  '' ;
 
-  installFlags = [ "INSTALL_DIR=\${out}/bin" ];
+  installFlags = [ "INSTALL_DIR=${placeholder "out"}/bin" ];
 
-  makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" "LZ4_SUPPORT=1" "LZO_SUPPORT=1"];
+  makeFlags = [
+    "XZ_SUPPORT=1"
+    "ZSTD_SUPPORT=1"
+    "LZ4_SUPPORT=1"
+    "LZO_SUPPORT=1"
+  ];
 
-  meta = {
+  meta = with lib; {
-    homepage = "http://squashfs.sourceforge.net/";
+    homepage = "https://github.com/plougher/squashfs-tools";
     description = "Tool for creating and unpacking squashfs filesystems";
-    platforms = lib.platforms.unix;
+    platforms = platforms.unix;
-    license = lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ ruuda ];
+    maintainers = with maintainers; [ ruuda ];
   };
 }

pkgs/tools/misc/calamares/default.nix

@@ -1,6 +1,6 @@
 { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore
 , kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase
-, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, glibc, tzdata
+, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata
 , ckbcomp, xkeyboard_config, mkDerivation
 }:
 
@@ -21,8 +21,6 @@ mkDerivation rec {
     qtquickcontrols qtsvg qttools qtwebengine.dev util-linux
   ];
 
-  enableParallelBuilding = false;
-
   cmakeFlags = [
     "-DPYTHON_LIBRARY=${python}/lib/lib${python.libPrefix}.so"
     "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}"

pkgs/tools/misc/cloud-utils/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, makeWrapper
 , gawk, gnused, util-linux, file
-, wget, python3, qemu-utils, euca2ools
+, wget, python3, qemu-utils
 , e2fsprogs, cdrkit
 , gptfdisk }:
 

pkgs/tools/virtualization/awsebcli/default.nix

@@ -92,5 +92,6 @@ in with localPython.pkgs; buildPythonApplication rec {
     description = "A command line interface for Elastic Beanstalk";
     maintainers = with maintainers; [ eqyiel ];
     license = licenses.asl20;
+    broken = true;
   };
 }

pkgs/tools/virtualization/cloud-init/default.nix

@@ -8,7 +8,6 @@
 , requests
 , jsonschema
 , jsonpatch
-, pytest
 , httpretty
 , dmidecode
 , pytestCheckHook
@@ -17,11 +16,9 @@
 , openssh
 }:
 
-let version = "20.3";
+buildPythonApplication rec {
-
-in buildPythonApplication {
   pname = "cloud-init";
-  inherit version;
+  version = "20.3";
   namePrefix = "";
 
   src = fetchFromGitHub {
@@ -81,10 +78,10 @@ in buildPythonApplication {
     export TMPDIR=/tmp
   '';
 
-  meta = {
+  meta = with lib; {
     homepage = "https://cloudinit.readthedocs.org";
     description = "Provides configuration and customization of cloud instance";
-    maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ];
+    maintainers = with maintainers; [ madjar phile314 ];
-    platforms = lib.platforms.all;
+    platforms = platforms.all;
   };
 }