diff options
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 24 insertions, 9 deletions
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index bd640845331fb..d510549f767be 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.9"; + version = "8.7.10"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-uFYeiw2hdX25mUBdudNCC4ZuFEoWyfghWmQR8IsQy+w="; + sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0="; }; - vendorHash = "sha256-lvSo8kl2du6Sv7zY3uheXaO6Qg+nblW0jpp2q8+1vyk="; + vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index e35b4cd07f380..f3f62e9407293 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -4,7 +4,8 @@ , unstableGitUpdater , poetry-core , nixops -, digital-ocean +, python-digitalocean +, pythonOlder }: buildPythonPackage { @@ -12,6 +13,8 @@ buildPythonPackage { version = "unstable-2022-08-14"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "nix-community"; repo = "nixops-digitalocean"; @@ -34,7 +37,7 @@ buildPythonPackage { ]; propagatedBuildInputs = [ - digital-ocean + python-digitalocean ]; pythonImportsCheck = [ "nixops_digitalocean" ]; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 19c91baf9a43e..5e61fc78091e6 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook, libsecret }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qt6, boost, openssl, libsecret }: stdenv.mkDerivation rec { pname = "chatterino2"; @@ -10,8 +10,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret ]; + nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; + buildInputs = [ + qt6.qtbase + qt6.qtsvg + qt6.qtimageformats + qt6.qttools + qt6.qt5compat + boost + openssl + libsecret + ] ++ lib.optionals stdenv.isLinux [ + qt6.qtwayland + ]; + cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" @@ -32,6 +44,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ rexim ]; + maintainers = with maintainers; [ rexim supa ]; }; } |