Merge master into staging-next

nixos/lib/qemu-common.nix

@@ -52,7 +52,6 @@ rec {
           # Pin virt-11.0 to avoid gic-version=3 that works on MacOS 15+ only.
           # FIXME: Revert to `virt` after minimal supported macos is 15+.
           aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt-11.0,accel=${accel "hvf"} -cpu max";
-          x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=${accel "hvf"} -cpu max";
         };
       };
 

pkgs/applications/networking/browsers/brave/make-brave.nix

@@ -71,7 +71,7 @@
   libxcb,
   zlib,
   # Darwin dependencies
-  undmg,
+  unzip,
   makeWrapper,
   # command line arguments which are always set e.g "--disable-gpu"
   commandLineArgs ? "",
@@ -194,7 +194,6 @@ stdenv.mkDerivation {
   dontConfigure = true;
   dontBuild = true;
   dontPatchELF = true;
-  dontStrip = stdenv.hostPlatform.isDarwin;
   doInstallCheck = stdenv.hostPlatform.isLinux;
 
   nativeBuildInputs =
@@ -205,7 +204,7 @@ stdenv.mkDerivation {
       (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      undmg
+      unzip
       makeWrapper
     ];
 

pkgs/applications/networking/browsers/brave/packages/brave-origin.nix

@@ -14,8 +14,8 @@ rec {
       sha256 = "0f76ec5f00413954355c19b0d6633b618ac4418afed333e14ece980c6b6b1495";
     };
     aarch64-darwin = {
-      url = "https://github.com/brave/brave-browser/releases/download/v${version}/Brave-Origin-arm64.dmg";
-      sha256 = "471eb0ec7e7ee7cd28a23c2c0ee5eebee4b621854f8966b2b45cc28e88332ecb";
+      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin-v${version}-darwin-arm64.zip";
+      sha256 = "223a57405f4beffa62191ec8c3da4dc57f22fe97bd40cb5a7e436f8090e410a4";
     };
   };
 }

pkgs/applications/networking/browsers/brave/packages/brave.nix

@@ -13,8 +13,8 @@ rec {
       sha256 = "21d7ac36b64a408dc598bb6ec3db84b07b2cbca854d26b28055a2fb5b94a2e77";
     };
     aarch64-darwin = {
-      url = "https://github.com/brave/brave-browser/releases/download/v${version}/Brave-Browser-arm64.dmg";
-      sha256 = "fdb8af6099d91ec3813c93d9cc1bcb6e59ee1b9fde97e0a94283e4ed6c5db3b5";
+      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
+      sha256 = "a92bb8dafc02bd386654e0149e386c816474b7e40bdf52b1d4d9723911df08df";
     };
   };
 }

pkgs/applications/networking/browsers/brave/update.py

@@ -8,12 +8,12 @@ download_urls = {
     "brave": {
         "aarch64-linux": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb",
         "x86_64-linux": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb",
-        "aarch64-darwin": "https://github.com/brave/brave-browser/releases/download/v${version}/Brave-Browser-arm64.dmg",
+        "aarch64-darwin": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip",
     },
     "brave-origin": {
         "aarch64-linux": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin_${version}_arm64.deb",
         "x86_64-linux": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin_${version}_amd64.deb",
-        "aarch64-darwin": "https://github.com/brave/brave-browser/releases/download/v${version}/Brave-Origin-arm64.dmg",
+        "aarch64-darwin": "https://github.com/brave/brave-browser/releases/download/v${version}/brave-origin-v${version}-darwin-arm64.zip",
     },
 }
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -164,13 +164,13 @@
     "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
   },
   "checkly_checkly": {
-    "hash": "sha256-rbIOAbrZ3eISHsHEqicYz8zj5oSPT5Cu3gEgJOxgMWw=",
+    "hash": "sha256-aLYlbeetd9zj3z7b2n8WUwf9KEIhSj88sgirREOL7Es=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.29.0",
+    "rev": "v1.27.0",
     "spdx": null,
-    "vendorHash": "sha256-FEoCrqx18Q3akX0FZeHKbBjjofuvzr/Dmc3F2GDhwXA="
+    "vendorHash": "sha256-x1fJ7qXcZr8tCdTTSndYQMAuSabyVNNVLpo9rxT3r4o="
   },
   "ciscodevnet_aci": {
     "hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=",
@@ -860,13 +860,13 @@
     "vendorHash": "sha256-d8RQfuLRNGTUzA2Ygy3QEis5j5Ape5kmcnZSs77c84M="
   },
   "linode_linode": {
-    "hash": "sha256-qTosTaOszWGrZ/SSy/6TXUB/rAGGxlwJBt6R/v9+jMk=",
+    "hash": "sha256-2HONH+N8sQleo3F4FT8SBpx1BJQwF2uxB4DN9dOEsIk=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v4.5.0",
+    "rev": "v4.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-NHisJsIyg7La53aSOiYbpR9BvoB8/wLjxL7tju+eMrc="
+    "vendorHash": "sha256-NkXMVJG8ZQOvJNMlrOYrfyp61n7cktFzDQ9oqI+x7xI="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=",

pkgs/by-name/gi/giflib/package.nix

@@ -48,10 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=${placeholder "out"}"
-  ]
-  ++ lib.optional (
-    stdenv.buildPlatform.parsed.kernel.name != stdenv.hostPlatform.parsed.kernel.name
-  ) "UNAME=${stdenv.hostPlatform.uname.system}";
+  ];
 
   postPatch = ''
     # we don't want to build HTML documentation

pkgs/by-name/so/soju/package.nix

@@ -12,16 +12,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "soju";
-  version = "0.11.0";
+  version = "0.10.1";
 
   src = fetchFromCodeberg {
     owner = "emersion";
     repo = "soju";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pen7Lb/aUWY67Y8KBCGfBkG1pX3sdQ8+D9L7xw8afaQ=";
+    hash = "sha256-kOV7EFRr+Ca9bQ1bdDMNf1FiiniIHDebsf5SpbJshsI=";
   };
 
-  vendorHash = "sha256-LiTr+ilKYRA3K93RjVGsmWm2jvImmt9YIYTZPtXv6cE=";
+  vendorHash = "sha256-NP4njea0hcklxWFoxPQqrvyWExeRP/TOzUJcamRnx+s=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/development/python-modules/safety-schemas/default.nix

@@ -12,13 +12,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "safety-schemas";
-  version = "0.0.21";
+  version = "0.0.20";
   pyproject = true;
 
   src = fetchPypi {
     pname = "safety_schemas";
     inherit (finalAttrs) version;
-    hash = "sha256-BrbSiUZK0VHDrbnoMe6jH5oigNC5vNN1A9uw0D00JfI=";
+    hash = "sha256-D9FHrnxlyLucCGEo9VHuhPrzEUALYQmmTkyiQSCw5WM=";
   };
 
   postPatch = ''