Merge master into staging-next

nixos/modules/services/x11/desktop-managers/plasma5.nix

@@ -264,6 +264,7 @@ in
           kwallet-pam
           kwalletmanager
           kwayland
+          kwayland-integration
           kwidgetsaddons
           kxmlgui
           kxmlrpcclient

pkgs/applications/graphics/photoflow/default.nix

@@ -86,5 +86,9 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     # sse3 is not supported on aarch64
     badPlatforms = [ "aarch64-linux" ];
+    # added 2021-09-30
+    # upstream seems pretty dead
+    #/build/source/src/operations/denoise.cc:30:10: fatal error: vips/cimg_funcs.h: No such file or directory
+    broken = true;
   };
 }

pkgs/applications/networking/cluster/terraform/default.nix

@@ -195,8 +195,8 @@ rec {
   };
 
   terraform_1_0 = mkTerraform {
-    version = "1.0.7";
-    sha256 = "115gb4mqz7lzyb80psbfy10k4h09fbvb1l8iz7kg63ajx69fnasy";
+    version = "1.0.8";
+    sha256 = "1755m3h9iz086znjpkhxjbyl3jaxpsqmk73infn9wbhql8pq2wil";
     vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42";
     patches = [ ./provider-path-0_15.patch ];
     passthru = { inherit plugins; };

pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch

@@ -1,50 +0,0 @@
-From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Wed, 9 Dec 2020 10:01:59 -0600
-Subject: [PATCH] platform plugins path
-
----
- src/pluginwrapper.cpp | 27 +++++++++++++--------------
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
-index a255d83..9699b08 100644
---- a/src/pluginwrapper.cpp
-+++ b/src/pluginwrapper.cpp
-@@ -25,20 +25,19 @@ static QStringList pluginCandidates()
- {
-     QStringList ret;
-     const auto paths = QCoreApplication::libraryPaths();
--    for (const QString &path : paths) {
--        static const QStringList searchFolders{
--            QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
--            QStringLiteral("/kf5/kwindowsystem"),
--        };
--        for (const QString &searchFolder : searchFolders) {
--            QDir pluginDir(path + searchFolder);
--            if (!pluginDir.exists()) {
--                continue;
--            }
--            const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
--            for (const QString &entry : entries) {
--                ret << pluginDir.absoluteFilePath(entry);
--            }
-+    const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH);
-+    static const QStringList searchFolders {
-+        QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
-+        QStringLiteral("/kf5/kwindowsystem"),
-+    };
-+    for (const QString &searchFolder : searchFolders) {
-+        QDir pluginDir(path + searchFolder);
-+        if (!pluginDir.exists()) {
-+            continue;
-+        }
-+        const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-+        for (const QString &entry : entries) {
-+            ret << pluginDir.absoluteFilePath(entry);
-         }
-     }
-     return ret;
--- 
-2.28.0
-

pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix

@@ -10,11 +10,5 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
   propagatedBuildInputs = [ qtbase ];
-  patches = [
-    ./0001-platform-plugins-path.patch
-  ];
-  preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
-  '';
   outputs = [ "out" "dev" ];
 }

pkgs/development/ocaml-modules/uucd/default.nix

@@ -6,11 +6,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "13.0.0";
+  version = "14.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1fg77hg4ibidkv1x8hhzl8z3rzmyymn8m4i35jrdibb8adigi8v2";
+    sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
     homepage = webpage;
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocaml.meta) platforms;
     maintainers = [ maintainers.vbgl ];
     license = licenses.bsd3;
   };

pkgs/development/ocaml-modules/uucp/default.nix

@@ -2,7 +2,7 @@
 
 let
   pname = "uucp";
-  version = "13.0.0";
+  version = "14.0.0";
   webpage = "https://erratique.ch/software/${pname}";
   minimumOCamlVersion = "4.03";
   doCheck = true;
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "sha256-OPpHbCOC/vMFdyHwyhCSisUv2PyO8xbeY2oq1a9HbqY=";
+    sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
     homepage = webpage;
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocaml.meta) platforms;
     license = licenses.bsd3;
     maintainers = [ maintainers.vbgl ];
   };

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

@@ -0,0 +1,55 @@
+{ buildPythonApplication
+, click
+, fetchPypi
+, git
+, httpretty
+, lib
+, qrcode
+, pygments
+, pyopenssl
+, pytestCheckHook
+, requests
+, rollbar
+, stripe
+, sure
+}:
+
+buildPythonApplication rec {
+  pname = "gigalixir";
+  version = "1.2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b7a9aed7e61a3828f5a11774803edc39358e2ac463b3b5e52af267f3420dc66";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "'pytest-runner'," ""
+  '';
+
+  propagatedBuildInputs = [
+    click
+    requests
+    stripe
+    rollbar
+    pygments
+    qrcode
+    pyopenssl
+  ];
+
+  checkInputs = [
+    httpretty
+    sure
+    pytestCheckHook
+    git
+  ];
+
+  pythonImportsCheck = [ "gigalixir" ];
+
+  meta = with lib; {
+    description = "Gigalixir Command-Line Interface";
+    homepage = "https://github.com/gigalixir/gigalixir-cli";
+    license = licenses.mit;
+    maintainers = with maintainers; [ superherointj ];
+  };
+}

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

@@ -0,0 +1,47 @@
+{ aiocontextvars
+, blinker
+, buildPythonPackage
+, fetchPypi
+, httpx
+, lib
+, mock
+, pytestCheckHook
+, requests
+, six
+, unittest2
+, webob
+}:
+
+buildPythonPackage rec {
+  pname = "rollbar";
+  version = "0.16.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    six
+  ];
+
+  checkInputs = [
+    webob
+    blinker
+    unittest2
+    mock
+    httpx
+    aiocontextvars
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "rollbar" ];
+
+  meta = with lib; {
+    description = "Error tracking and logging from Python to Rollbar";
+    homepage = "https://github.com/rollbar/pyrollbar";
+    license = licenses.mit;
+    maintainers = with maintainers; [ superherointj ];
+  };
+}

pkgs/development/tools/misc/saleae-logic-2/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, gtk3 }:
+{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }:
 let
   name = "saleae-logic-2";
   version = "2.3.37";
@@ -6,6 +6,15 @@ let
     url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage";
     sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45";
   };
+  desktopItem = makeDesktopItem {
+    inherit name;
+    exec = name;
+    icon = "Logic";
+    comment = "Software for Saleae logic analyzers";
+    desktopName = "Saleae Logic";
+    genericName = "Logic analyzer";
+    categories = "Development";
+  };
 in
 appimageTools.wrapType2 {
   inherit name src;
@@ -17,6 +26,9 @@ appimageTools.wrapType2 {
       ''
         mkdir -p $out/etc/udev/rules.d
         cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/
+        mkdir -p $out/share/pixmaps
+        ln -s ${desktopItem}/share/applications $out/share/
+        cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
       '';
 
   profile = ''

pkgs/development/tools/poetry2nix/poetry2nix/default.nix

@@ -5,7 +5,7 @@
 }:
 let
   # Poetry2nix version
-  version = "1.20.0";
+  version = "1.21.0";
 
   inherit (poetryLib) isCompatible readTOML moduleName;
 
@@ -339,6 +339,9 @@ lib.makeScope pkgs.newScope (self: {
             ) { inherit app; };
           };
 
+          # Extract position from explicitly passed attrs so meta.position won't point to poetry2nix internals
+          pos = builtins.unsafeGetAttrPos (lib.elemAt (lib.attrNames attrs) 0) attrs;
+
           meta = lib.optionalAttrs (lib.hasAttr "description" pyProject.tool.poetry)
             {
               inherit (pyProject.tool.poetry) description;

pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix

@@ -156,6 +156,12 @@ self: super:
     }
   );
 
+  cheroot = super.cheroot.overridePythonAttrs (
+    old: {
+      dontPreferSetupPy = true;
+    }
+  );
+
   colour = super.colour.overridePythonAttrs (
     old: {
       buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ];
@@ -547,6 +553,7 @@ self: super:
         self.pytestrunner
         self.cryptography
         self.pyjwt
+        self.setuptools-scm-git-archive
       ];
     }
   );

pkgs/top-level/all-packages.nix

@@ -24145,6 +24145,8 @@ with pkgs;
 
   fnott = callPackage ../applications/misc/fnott { };
 
+  gigalixir = with python3Packages; toPythonApplication gigalixir;
+
   go-libp2p-daemon = callPackage ../servers/go-libp2p-daemon { };
 
   go-motion = callPackage ../development/tools/go-motion { };

pkgs/top-level/python-packages.nix

@@ -2976,6 +2976,8 @@ in {
 
   gidgethub = callPackage ../development/python-modules/gidgethub { };
 
+  gigalixir = callPackage ../development/python-modules/gigalixir { };
+
   gin-config = callPackage ../development/python-modules/gin-config { };
 
   gios = callPackage ../development/python-modules/gios { };
@@ -7989,6 +7991,8 @@ in {
 
   rokuecp = callPackage ../development/python-modules/rokuecp { };
 
+  rollbar = callPackage ../development/python-modules/rollbar { };
+
   roman = callPackage ../development/python-modules/roman { };
 
   roombapy = callPackage ../development/python-modules/roombapy { };