From de5ffe51f6f67285c6096a2b6e8e4a2151a8822a Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sun, 26 Sep 2021 17:24:35 +0300 Subject: [PATCH 1/8] plasma5: load kwayland-integration plugin Signed-off-by: Yaroslav Bolyukin --- .../services/x11/desktop-managers/plasma5.nix | 1 + .../0001-platform-plugins-path.patch | 50 ------------------- .../kde-frameworks/kwindowsystem/default.nix | 6 --- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d8dc2675f068..16b82f972cbd 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -264,6 +264,7 @@ in kwallet-pam kwalletmanager kwayland + kwayland-integration kwidgetsaddons kxmlgui kxmlrpcclient diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch deleted file mode 100644 index 0093eb556bfd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -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 - diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 409293093382..7643572a7ec0 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/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" ]; } From 7dad6965ddc958a19299d7b615bbb5dace6ac2e9 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 Sep 2021 15:37:00 -0300 Subject: [PATCH 2/8] python3Packages.gigalixir: init 1.2.3 --- .../python-modules/gigalixir/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/gigalixir/default.nix diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix new file mode 100644 index 000000000000..089c4240f293 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2361851b5017..d646c0d71726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24080,6 +24080,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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f138448c155f..e34e8060aec4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2960,6 +2960,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 { }; From c0b0beb28ae718d4468c2f0e3978f637753ad69e Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 23 Sep 2021 15:44:56 -0300 Subject: [PATCH 3/8] python3Packages.rollbar: init 0.16.2 --- .../python-modules/rollbar/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/rollbar/default.nix diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix new file mode 100644 index 000000000000..60787d5158ad --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e34e8060aec4..db176df215a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7945,6 +7945,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 { }; From 8b1e1396225790a0a1fb7961a4848c773737cff9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 Sep 2021 01:38:30 +0300 Subject: [PATCH 4/8] photoflow: mark as broken --- pkgs/applications/graphics/photoflow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 79a171d6fc3f..46e5ce420a78 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/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; }; } From 8bcd17d6a859b44b24e5ef5d14e0fc6a2eaf9c69 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 30 Sep 2021 01:45:05 +0200 Subject: [PATCH 5/8] terraform_1_0: 1.0.7 -> 1.0.8 - https://github.com/hashicorp/terraform/releases/tag/v1.0.8 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 5e2253aaa622..85b6cf679a9a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/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; }; From c4035d7234d3b020e230f1094ae1e5efd64d7aa0 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 29 Sep 2021 17:10:21 -0700 Subject: [PATCH 6/8] saleae-logic-2: add desktop item --- .../tools/misc/saleae-logic-2/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 80c722221164..6318dbb3ff63 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/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 = '' From c779050edb56f5958d28af7aec444c14f6a18163 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 29 Sep 2021 21:35:44 -0500 Subject: [PATCH 7/8] poetry2nix: 1.20.0 -> 1.21.0 --- pkgs/development/tools/poetry2nix/poetry2nix/default.nix | 5 ++++- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 22ab12149285..dae0a02b6175 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/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; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index daf536561f11..ab1a5324c98e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/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 ]; } ); From 824043e09c9421d6750f60abca9b23d7699868ea Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 28 Sep 2021 22:00:31 +0200 Subject: [PATCH 8/8] =?UTF-8?q?ocamlPackages.uucd:=2013.0.0=20=E2=86=92=20?= =?UTF-8?q?14.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.uucp: 13.0.0 → 14.0.0 --- pkgs/development/ocaml-modules/uucd/default.nix | 6 +++--- pkgs/development/ocaml-modules/uucp/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index f5d932336150..244f3f36dc39 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/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; }; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index bb70ff6a4b7e..2e8a360d4550 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/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 ]; };