Merge remote-tracking branch 'origin/master' into staging-next

pkgs/applications/networking/remote/remmina/default.nix

@@ -8,7 +8,6 @@
   wrapGAppsHook3,
   curl,
   fuse3,
-  fetchpatch2,
   desktopToDarwinBundle,
   glib,
   gtk3,
@@ -109,6 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ]
     ++ lib.optionals withVte [ vte ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   cmakeFlags =
     [
       "-DWITH_FREERDP3=ON"

pkgs/by-name/nc/ncspot/package.nix

@@ -34,17 +34,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ncspot";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     tag = "v${version}";
-    hash = "sha256-h3Mp67AKuzzeO6l7jN6yrQAHpYSsaOp1Y+qJoamK82U=";
+    hash = "sha256-4zeBTi1WBy9tXowsehUo4qou6bhznWPeCXFg+R3akho=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HxEd6A+e1N62LyoVPEDuq7xYEhQTjKYlif27rZTrXBQ=";
+  cargoHash = "sha256-c16qw2khbMXTA8IbYQnMKqivO63DwyAWKfV2P1aD7dU=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3;