Merge pull request #115306 from SuperSandro2000/fix-collection22

pkgs/applications/kde/ark/default.nix

@@ -1,18 +1,12 @@
-{
+{ mkDerivation, lib, config
-  mkDerivation, lib, config,
+, extra-cmake-modules, kdoctools
-
+, breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n
-  extra-cmake-modules, kdoctools,
+, kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons
-
+, libarchive, libzip
-  breeze-icons, karchive, kconfig, kcrash, kdbusaddons, ki18n,
+# Archive tools
-  kiconthemes, kitemmodels, khtml, kio, kparts, kpty, kservice, kwidgetsaddons,
+, p7zip, lrzip
-
+# Unfree tools
-  libarchive, libzip,
+, unfreeEnableUnrar ? false, unrar
-
-  # Archive tools
-  p7zip, lrzip,
-
-  # Unfree tools
-  unfreeEnableUnrar ? false, unrar,
 }:
 
 let
@@ -21,20 +15,23 @@ in
 
 mkDerivation {
   pname = "ark";
-  meta = {
-    description = "Graphical file compression/decompression utility";
-    license = with lib.licenses;
-      [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 
   outputs = [ "out" "dev" ];
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
   buildInputs = [ libarchive libzip ] ++ extraTools;
+
   propagatedBuildInputs = [
     breeze-icons karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio
     kitemmodels kparts kpty kservice kwidgetsaddons
   ];
 
   qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath extraTools) ];
+
+  meta = with lib; {
+    description = "Graphical file compression/decompression utility";
+    license = with licenses; [ gpl2 lgpl3 ] ++ optional unfreeEnableUnrar unfree;
+    maintainers = [ maintainers.ttuegel ];
+  };
 }

pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix

@@ -6,8 +6,7 @@ let
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url =
+    url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
-      "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage";
     sha256 = "sha256-iw2tU8qqXWbtEdLGlW8HNBHx8F2CgnCGCBUWpM407us=";
   };
 

pkgs/development/libraries/kde-frameworks/kguiaddons.nix

@@ -1,17 +1,19 @@
-{
+{ mkDerivation, lib
-  mkDerivation, lib,
+, extra-cmake-modules
-  extra-cmake-modules,
+, qtbase, qtx11extras, wayland
-  qtbase, qtx11extras, wayland,
 }:
 
 mkDerivation {
   name = "kguiaddons";
-  meta = {
+
-    maintainers = [ lib.maintainers.ttuegel ];
-    broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
-  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtx11extras wayland ];
   propagatedBuildInputs = [ qtbase ];
+
   outputs = [ "out" "dev" ];
+
+  meta = with lib; {
+    maintainers = [ maintainers.ttuegel ];
+    broken = versionOlder qtbase.version "5.14.0";
+  };
 }

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

@@ -1,9 +1,7 @@
-{ lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
+{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
 , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
-, service-identity
+, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false
-, gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
+}:
-, withManpage ? false }:
-
 
 buildPythonPackage rec {
   pname = "alot";
@@ -41,7 +39,7 @@ buildPythonPackage rec {
   doCheck = false;
   postBuild = lib.optionalString withManpage "make -C docs man";
 
-  checkInputs =  [ awk future mock gnupg procps ];
+  checkInputs =  [ gawk future mock gnupg procps ];
 
   postInstall = let
     completionPython = python.withPackages (ps: [ ps.configobj ]);

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

@@ -6,6 +6,7 @@
 , isPy3k
 , sqlalchemy
 , pytestCheckHook
+, stdenv
 }:
 
 buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ];
+
   meta = with lib; {
     homepage = "https://github.com/crate/crate-python";
     description = "A Python client library for CrateDB";

pkgs/development/python-modules/googleapis-common-protos/default.nix

@@ -3,7 +3,6 @@
 , fetchPypi
 , grpc
 , protobuf
-, pytestCheckHook
 }:
 
 buildPythonPackage rec {

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

@@ -66,5 +66,7 @@ buildPythonPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ evax ];
     platforms = platforms.unix;
+    # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest'
+    broken = true;
   };
 }

pkgs/development/tools/parsing/tree-sitter/default.nix

@@ -108,7 +108,7 @@ in rustPlatform.buildRustPackage {
     };
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "https://github.com/tree-sitter/tree-sitter";
     description = "A parser generator tool and an incremental parsing library";
     longDescription = ''
@@ -122,10 +122,9 @@ in rustPlatform.buildRustPackage {
       * Robust enough to provide useful results even in the presence of syntax errors
       * Dependency-free so that the runtime library (which is written in pure C) can be embedded in any application
     '';
-    license = lib.licenses.mit;
+    license = licenses.mit;
-    maintainers = with lib.maintainers; [ Profpatsch ];
+    maintainers = with maintainers; [ Profpatsch ];
     # Aarch has test failures with how tree-sitter compiles the generated C files
     broken = stdenv.isAarch64;
   };
-
 }

pkgs/tools/audio/beets/default.nix

@@ -1,24 +1,23 @@
 { stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
 , pythonPackages, imagemagick, gobject-introspection, gst_all_1
-, runtimeShell
+, runtimeShell, unstableGitUpdater
-, unstableGitUpdater
 
 # external plugins package set
 , beetsExternalPlugins
 
-, enableAbsubmit         ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
+, enableAbsubmit         ? lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor
 , enableAcousticbrainz   ? true
 , enableAcoustid         ? true
-, enableBadfiles         ? true, flac ? null, mp3val ? null
+, enableBadfiles         ? true, flac, mp3val
 , enableBeatport         ? true
 , enableBpsync           ? true
-, enableConvert          ? true, ffmpeg ? null
+, enableConvert          ? true, ffmpeg
 , enableDeezer           ? true
 , enableDiscogs          ? true
 , enableEmbyupdate       ? true
 , enableFetchart         ? true
 , enableGmusic           ? true
-, enableKeyfinder        ? true, keyfinder-cli ? null
+, enableKeyfinder        ? true, keyfinder-cli
 , enableKodiupdate       ? true
 , enableLastfm           ? true
 , enableLoadext          ? true
@@ -33,32 +32,14 @@
 
 # External plugins
 , enableAlternatives     ? false
-, enableCheck            ? false, liboggz ? null
+, enableCheck            ? false, liboggz
 , enableCopyArtifacts    ? false
 , enableExtraFiles       ? false
 
 , bashInteractive, bash-completion
 }:
 
-assert enableAbsubmit    -> essentia-extractor               != null;
-assert enableAcoustid    -> pythonPackages.pyacoustid        != null;
-assert enableBadfiles    -> flac != null && mp3val != null;
-assert enableBeatport    -> pythonPackages.requests_oauthlib != null;
 assert enableBpsync      -> enableBeatport;
-assert enableCheck       -> flac != null && mp3val != null && liboggz != null;
-assert enableConvert     -> ffmpeg                         != null;
-assert enableDiscogs     -> pythonPackages.discogs_client    != null;
-assert enableFetchart    -> pythonPackages.responses         != null;
-assert enableGmusic      -> pythonPackages.gmusicapi         != null;
-assert enableKeyfinder   -> keyfinder-cli                    != null;
-assert enableLastfm      -> pythonPackages.pylast            != null;
-assert enableMpd         -> pythonPackages.mpd2              != null;
-assert enableReplaygain  -> ffmpeg                         != null;
-assert enableSonosUpdate -> pythonPackages.soco              != null;
-assert enableThumbnails  -> pythonPackages.pyxdg             != null;
-assert enableWeb         -> pythonPackages.flask             != null;
-
-with lib;
 
 let
   optionalPlugins = {
@@ -99,20 +80,20 @@ let
     "types" "unimported" "zero"
   ];
 
-  enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
+  enabledOptionalPlugins = lib.attrNames (lib.filterAttrs (_: lib.id) optionalPlugins);
 
-  allPlugins = pluginsWithoutDeps ++ attrNames optionalPlugins;
+  allPlugins = pluginsWithoutDeps ++ lib.attrNames optionalPlugins;
   allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins;
 
   testShell = "${bashInteractive}/bin/bash --norc";
   completion = "${bash-completion}/share/bash-completion/bash_completion";
 
   # This is a stripped down beets for testing of the external plugins.
-  externalTestArgs.beets = (beets.override {
+  externalTestArgs.beets = (lib.beets.override {
     enableAlternatives = false;
     enableCopyArtifacts = false;
     enableExtraFiles = false;
-  }).overrideAttrs (const {
+  }).overrideAttrs (lib.const {
     doInstallCheck = false;
   });
 
@@ -147,10 +128,10 @@ in pythonPackages.buildPythonApplication rec {
     pythonPackages.confuse
     pythonPackages.mediafile
     gobject-introspection
-  ] ++ optional enableAbsubmit      essentia-extractor
+  ] ++ lib.optional enableAbsubmit      essentia-extractor
-    ++ optional enableAcoustid      pythonPackages.pyacoustid
+    ++ lib.optional enableAcoustid      pythonPackages.pyacoustid
-    ++ optional enableBeatport      pythonPackages.requests_oauthlib
+    ++ lib.optional enableBeatport      pythonPackages.requests_oauthlib
-    ++ optional (enableFetchart
+    ++ lib.optional (enableFetchart
               || enableDeezer
               || enableEmbyupdate
               || enableKodiupdate
@@ -160,19 +141,19 @@ in pythonPackages.buildPythonApplication rec {
               || enableSubsonicupdate
               || enableAcousticbrainz)
                                     pythonPackages.requests
-    ++ optional enableCheck         beetsExternalPlugins.check
+    ++ lib.optional enableCheck         beetsExternalPlugins.check
-    ++ optional enableConvert       ffmpeg
+    ++ lib.optional enableConvert       ffmpeg
-    ++ optional enableDiscogs       pythonPackages.discogs_client
+    ++ lib.optional enableDiscogs       pythonPackages.discogs_client
-    ++ optional enableGmusic        pythonPackages.gmusicapi
+    ++ lib.optional enableGmusic        pythonPackages.gmusicapi
-    ++ optional enableKeyfinder     keyfinder-cli
+    ++ lib.optional enableKeyfinder     keyfinder-cli
-    ++ optional enableLastfm        pythonPackages.pylast
+    ++ lib.optional enableLastfm        pythonPackages.pylast
-    ++ optional enableMpd           pythonPackages.mpd2
+    ++ lib.optional enableMpd           pythonPackages.mpd2
-    ++ optional enableSonosUpdate   pythonPackages.soco
+    ++ lib.optional enableSonosUpdate   pythonPackages.soco
-    ++ optional enableThumbnails    pythonPackages.pyxdg
+    ++ lib.optional enableThumbnails    pythonPackages.pyxdg
-    ++ optional enableWeb           pythonPackages.flask
+    ++ lib.optional enableWeb           pythonPackages.flask
-    ++ optional enableAlternatives  beetsExternalPlugins.alternatives
+    ++ lib.optional enableAlternatives  beetsExternalPlugins.alternatives
-    ++ optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
+    ++ lib.optional enableCopyArtifacts beetsExternalPlugins.copyartifacts
-    ++ optional enableExtraFiles    beetsExternalPlugins.extrafiles
+    ++ lib.optional enableExtraFiles    beetsExternalPlugins.extrafiles
   ;
 
   buildInputs = [
@@ -209,12 +190,12 @@ in pythonPackages.buildPythonApplication rec {
     # bs1770gain, and set the absolute path there, to avoid impurities.
     ++ lib.optional enableReplaygain (substituteAll {
       src = ./replaygain-default-ffmpeg.patch;
-      ffmpeg = getBin ffmpeg;
+      ffmpeg = lib.getBin ffmpeg;
     })
     # Put absolute Nix paths in place
     ++ lib.optional enableConvert (substituteAll {
       src = ./convert-plugin-ffmpeg-path.patch;
-      ffmpeg = getBin ffmpeg;
+      ffmpeg = lib.getBin ffmpeg;
     })
     ++ lib.optional enableBadfiles (substituteAll {
       src = ./badfiles-plugin-nix-paths.patch;
@@ -269,7 +250,7 @@ in pythonPackages.buildPythonApplication rec {
     EDITOR="${writeScript "beetconfig.sh" ''
       #!${runtimeShell}
       cat > "$1" <<CFG
-      plugins: ${concatStringsSep " " allEnabledPlugins}
+      plugins: ${lib.concatStringsSep " " allEnabledPlugins}
       CFG
     ''}" HOME="$tmphome" "$out/bin/beet" config -e
     EDITOR=true HOME="$tmphome" "$out/bin/beet" config -e
@@ -285,7 +266,7 @@ in pythonPackages.buildPythonApplication rec {
     updateScript = unstableGitUpdater { url = "https://github.com/beetbox/beets"; };
   };
 
-  meta = {
+  meta = with lib; {
     description = "Music tagger and library organizer";
     homepage = "http://beets.io";
     license = licenses.mit;

pkgs/tools/misc/lorri/default.nix

@@ -1,13 +1,11 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , pkgs
+, rustPackages
 , fetchFromGitHub
 , rustPlatform
-  # Updater script
-, runtimeShell
 , writers
-  # Tests
 , nixosTests
-  # Apple dependencies
 , CoreServices
 , Security
 }:
@@ -23,13 +21,6 @@ in (rustPlatform.buildRustPackage rec {
   pname = "lorri";
   inherit version;
 
-  meta = with lib; {
-    description = "Your project's nix-env";
-    homepage = "https://github.com/nix-community/lorri";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ grahamc Profpatsch ];
-  };
-
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
@@ -43,11 +34,10 @@ in (rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   BUILD_REV_COUNT = src.revCount or 1;
-  RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
+  RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix { };
 
-  nativeBuildInputs = with pkgs; [ rustPackages.rustfmt ];
+  nativeBuildInputs = [ rustPackages.rustfmt ];
-  buildInputs =
+  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
-    lib.optionals stdenv.isDarwin [ CoreServices Security ];
 
   # copy the docs to the $man and $doc outputs
   postInstall = ''
@@ -70,4 +60,11 @@ in (rustPlatform.buildRustPackage rec {
       nixos = nixosTests.lorri;
     };
   };
+
+  meta = with lib; {
+    description = "Your project's nix-env";
+    homepage = "https://github.com/target/lorri";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ grahamc Profpatsch ];
+  };
 })

pkgs/tools/security/hashdeep/default.nix

@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
     description = "A set of cross-platform tools to compute hashes";
     homepage = "https://github.com/jessek/hashdeep";
     license = licenses.gpl2;
+    maintainers = [ maintainers.karantan ];
+    platforms = platforms.all;
     # Build fails on Darwin:
     # > ./xml.h:103:82: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
     # >     void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); }
-    platforms = with platforms; linux ++ freebsd ++ openbsd;
+    broken = stdenv.isDarwin;
-    maintainers = [ maintainers.karantan ];
   };
 }