Merge master into staging-next

pkgs/by-name/dy/dynamips/package.nix

@@ -3,6 +3,7 @@
   stdenv,
   cmake,
   fetchFromGitHub,
+  fetchpatch,
   libelf,
   libpcap,
   nix-update-script,
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";
   };
 
+  patches = [
+    # https://github.com/GNS3/dynamips/issues/305
+    (fetchpatch {
+      name = "cmake4-compat.patch";
+      url = "https://github.com/GNS3/dynamips/commit/fdbbb7d3887eaa5b024bbcbcc14215f420a7e989.patch";
+      hash = "sha256-CbiPGrIqn9KGnZEPUw7LiH8dkqzjfu4UxW1f7Fzbwro=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

pkgs/by-name/oc/oci-cli/package.nix

@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.67.0";
+  version = "3.68.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-sdd0/kUUqxMzmoeY0QZHSSQF+XVNWnzZRI5GIhR3W5s=";
+    hash = "sha256-gkMTfF77yfjx4CxhJ+mpNA1HsDjXMBMwDaI67dJF/8I=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/by-name/ro/rofi-nerdy/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rofi-nerdy";
-  version = "0.0.8";
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "rofi-nerdy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RiQ8bP7Q1ItZfCO94R95aTenqVOD45ohfUdmtDn0r9k=";
+    hash = "sha256-FxMRUE4OKF0e1gNVFuEIGCbV83tUVj4ZNZFCjFqNb64=";
   };
 
-  cargoHash = "sha256-NvS38uTqlBTUmRg2z0Faa5bTlRC/DTXQU3MCcSmPerA=";
+  cargoHash = "sha256-z7pfVLlOZFKxoqk87cHFd//DOArCvTpPK83UmJwmdtw=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/development/python-modules/ansible-compat/default.nix

@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "ansible-compat";
-  version = "25.8.1";
+  version = "25.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ansible";
     repo = "ansible-compat";
     tag = "v${version}";
-    hash = "sha256-u1yBRhE4i30RAyFe5UtRPyVeOYRzec2VE2H5qmH3dGM=";
+    hash = "sha256-g3iSSj42QB0kr0yTIfUVR9q2NCu/peQTRStlUjKKkl8=";
   };
 
   build-system = [

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

@@ -1,47 +0,0 @@
-{
-  stdenv,
-  lib,
-  buildPythonPackage,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  libX11,
-  libXtst,
-  libXi,
-  libxkbfile,
-  xorgproto,
-}:
-
-let
-  majorVersion = "0.63";
-  minorVersion = "0";
-in
-buildPythonPackage rec {
-  pname = "virtkey";
-  version = "${majorVersion}.${minorVersion}";
-  format = "setuptools";
-
-  src = fetchurl {
-    url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz";
-    sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    gtk2
-    libX11
-    libXtst
-    libXi
-    libxkbfile
-    xorgproto
-  ];
-
-  meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
-    description = "Extension to emulate keypresses and to get the layout information from the X server";
-    homepage = "https://launchpad.net/virtkey";
-    license = licenses.gpl3;
-    maintainers = [ ];
-  };
-}

pkgs/os-specific/linux/amneziawg/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amneziawg";
-  version = "1.0.20240711";
+  version = "1.0.20251009";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-linux-kernel-module";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WOcBTxetVz2Sr62c+2aGNyohG2ydi+R+az+4qHbKprI=";
+    hash = "sha256-OcMlwXOwjxLqHkAQHSwDigK6wuOFCSzoE5spVwybN1M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

pkgs/top-level/aliases.nix

@@ -2738,6 +2738,7 @@ mapAliases {
   viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
+  virtkey = throw "'virtkey' has been removed, as it was unmaintained, abandoned upstream, and relied on gtk2."; # Added 2025-10-12
   virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
   vistafonts = vista-fonts; # Added 2025-02-03
   vistafonts-chs = vista-fonts-chs; # Added 2025-02-03

pkgs/top-level/python-packages.nix

@@ -19822,8 +19822,6 @@ self: super: with self; {
 
   virt-firmware = callPackage ../development/python-modules/virt-firmware { };
 
-  virtkey = callPackage ../development/python-modules/virtkey { };
-
   virtual-glob = callPackage ../development/python-modules/virtual-glob { };
 
   virtualenv = callPackage ../development/python-modules/virtualenv { };