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

maintainers/maintainer-list.nix

@@ -6641,13 +6641,6 @@
     github = "dsymbol";
     githubId = 88138099;
   };
-  dtomvan = {
-    email = "18gatenmaker6@gmail.com";
-    github = "dtomvan";
-    githubId = 51440893;
-    name = "Tom van Dijk";
-    keys = [ { fingerprint = "D044 F07B 8863 B681 26BD  79FE 7A98 4C82 07AD BA51"; } ];
-  };
   dtzWill = {
     email = "w@wdtz.org";
     github = "dtzWill";

pkgs/applications/science/math/wxmaxima/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxmaxima";
-  version = "25.01.0";
+  version = "25.04.0";
 
   src = fetchFromGitHub {
     owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${finalAttrs.version}";
-    hash = "sha256-XFlEBmKxpi7NnUxVXV2F+zQKrvR4r93aLtHOoVZ7SPw=";
+    hash = "sha256-AEy2a8BahV1yH67RIjcsVipuo5eUZcQZxR3HygSYGlU=";
   };
 
   buildInputs = [

pkgs/by-name/fo/forbidden/package.nix

@@ -6,23 +6,23 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "forbidden";
-  version = "12.6";
+  version = "13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ivan-sincek";
     repo = "forbidden";
     tag = "v${version}";
-    hash = "sha256-KE2FHn0ocAna5ReRi9re/u8gdNVkCygSbSRj8gEudgI=";
+    hash = "sha256-DQ8zjiLTgBBoqp8AP5BYULz4KGnVEt8e7bkfYRGWvFw=";
   };
 
-  build-system = with python3.pkgs; [
-    setuptools
-  ];
+  build-system = with python3.pkgs; [ setuptools ];
 
   dependencies = with python3.pkgs; [
     alive-progress
+    bot-safe-agents
     colorama
+    cryptography
     pycurl
     pyjwt
     regex
@@ -31,16 +31,17 @@ python3.pkgs.buildPythonApplication rec {
     termcolor
   ];
 
-  pythonImportsCheck = [
-    "forbidden"
-  ];
+  # Project has no tests
+  doCheck = false;
 
-  meta = with lib; {
+  pythonImportsCheck = [ "forbidden" ];
+
+  meta = {
     description = "Tool to bypass 4xx HTTP response status code";
     homepage = "https://github.com/ivan-sincek/forbidden";
-    changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "forbidden";
   };
 }

pkgs/by-name/se/secretscanner/package.nix

@@ -2,11 +2,11 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  hyperscan,
   pkg-config,
   protobuf,
   protoc-gen-go,
   protoc-gen-go-grpc,
+  vectorscan,
 }:
 
 buildGoModule rec {
@@ -35,7 +35,7 @@ buildGoModule rec {
   ];
 
   buildInputs = [
-    hyperscan
+    vectorscan
   ];
 
   preBuild = ''
@@ -52,7 +52,10 @@ buildGoModule rec {
     mainProgram = "secretscanner";
     homepage = "https://github.com/deepfence/SecretScanner";
     changelog = "https://github.com/deepfence/SecretScanner/releases/tag/v${version}";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

pkgs/by-name/sl/slint-viewer/package.nix

@@ -1,52 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchCrate,
-  kdePackages,
-  libGL,
-  nix-update-script,
-  versionCheckHook,
-  withQt6Support ? true,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "slint-viewer";
-  version = "1.10.0";
-
-  src = fetchCrate {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-i6JB/bc8lQE9K9Jy1mUz2I/LKIoEtc/dgJzsQTcEXeQ=";
-  };
-
-  useFetchCargoVendor = true;
-  cargoHash = "sha256-fXREHHPR2CZtyvvOdL5wKnkmT1q9Xj+ik2lR/52ApLI=";
-
-  CXXFLAGS = lib.optionals withQt6Support [
-    "-I ${lib.getDev libGL}/include"
-  ];
-
-  nativeBuildInputs = lib.optionals withQt6Support (
-    with kdePackages;
-    [
-      qtbase
-      qtsvg
-      wrapQtAppsHook
-    ]
-  );
-
-  # There are no tests
-  doCheck = false;
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Viewer for .slint files from the Slint Project";
-    mainProgram = "slint-viewer";
-    homepage = "https://github.com/slint-ui/slint/tree/master/tools/viewer";
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ dtomvan ];
-  };
-})

pkgs/by-name/ya/yazi/plugins/rsync/default.nix

@@ -0,0 +1,22 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "rsync.yazi";
+  version = "0-unstable-2025-04-12";
+  src = fetchFromGitHub {
+    owner = "GianniBYoung";
+    repo = "rsync.yazi";
+    rev = "ed7b7f9de971ecd8376d7ccb7a6d0d6f979c1dcb";
+    hash = "sha256-xAhkDTNi0MjHqESKk8j60WABYvaF7NElO2W/rsL2w2Y=";
+  };
+
+  meta = {
+    description = "Simple rsync plugin for yazi file manager";
+    homepage = "https://github.com/GianniBYoung/rsync.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ teto ];
+  };
+}

pkgs/by-name/yo/your_spotify/package.nix

@@ -14,18 +14,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "your_spotify_server";
-  version = "1.12.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "Yooooomi";
     repo = "your_spotify";
     tag = finalAttrs.version;
-    hash = "sha256-QmDjBZEKI5wQ2fcbfVLI6aD9+73ROeKnXWYUz2eSimc=";
+    hash = "sha256-Acf+y8/Aga6rKwdb9b6im58IWqiKX4wHDeUzT5ApPqs=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-LlSYrDIUkvIlcR4emvLBNtaqzEVISirekv9G+AX6XbM=";
+    hash = "sha256-N70gsVnlzRQMRK16aeqHQeBAg9A2Fvh9CuivyBNPPDA=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/bot-safe-agents/default.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "bot-safe-agents";
+  version = "1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ivan-sincek";
+    repo = "bot-safe-agents";
+    tag = "v${version}";
+    hash = "sha256-XO7iCZ7Dik7CmeFPwmMZf5K4COT5mRhDZMTsQxfR45c=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "bot_safe_agents" ];
+
+  meta = {
+    description = "Library for fetching a list of bot-safe user agents";
+    homepage = "https://github.com/ivan-sincek/bot-safe-agents";
+    changelog = "https://github.com/ivan-sincek/bot-safe-agents/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

pkgs/development/python-modules/onedrive-personal-sdk/default.nix

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "onedrive-personal-sdk";
-  version = "0.0.13";
+  version = "0.0.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-uR3uqMgRGY3KNWZtNO2OIM2/LcZKyeWvhnFuQvmgPrE=";
+    hash = "sha256-WdnkIMmTzvid2bl7n9NHMtF153O91hutMib8bs5BgIs=";
   };
 
   build-system = [ setuptools ];

pkgs/top-level/python-packages.nix

@@ -2007,6 +2007,8 @@ self: super: with self; {
 
   bottombar = callPackage ../development/python-modules/bottombar { };
 
+  bot-safe-agents = callPackage ../development/python-modules/bot-safe-agents { };
+
   bpemb = callPackage ../development/python-modules/bpemb { };
 
   bpylist2 = callPackage ../development/python-modules/bpylist2 { };