From 6d07fea2324e8e464287f301161d968d3dacf62e Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 08:03:16 +0800 Subject: [PATCH 1/9] forbidden: 12.6 -> 13.2 Diff: https://github.com/ivan-sincek/forbidden/compare/refs/tags/v12.6...refs/tags/v13.2 Changelog: https://github.com/ivan-sincek/forbidden/releases/tag/v13.2 --- pkgs/by-name/fo/forbidden/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index b5fea8aad7ed..89dce3735a03 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -1,24 +1,22 @@ { lib, - fetchFromGitHub, python3, + fetchFromGitHub, }: 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 @@ -29,18 +27,20 @@ python3.pkgs.buildPythonApplication rec { requests tabulate termcolor + bot-safe-agents + cryptography ]; pythonImportsCheck = [ "forbidden" ]; - meta = with lib; { + 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 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "forbidden"; }; } From 28a7973a31e5e54aeeebd09568e830ab2fb61a08 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 08:15:30 +0800 Subject: [PATCH 2/9] python313Packages.bot-safe-agents: init at 1.0 --- .../bot-safe-agents/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/bot-safe-agents/default.nix diff --git a/pkgs/development/python-modules/bot-safe-agents/default.nix b/pkgs/development/python-modules/bot-safe-agents/default.nix new file mode 100644 index 000000000000..db9e87a6fe3e --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebcbb4eefda6..f84f777ff502 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2009,6 +2009,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 { }; From c30d51a0f69705af977c314f9ecc9623b6561b3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Apr 2025 05:51:15 +0000 Subject: [PATCH 3/9] your_spotify: 1.12.0 -> 1.13.1 --- pkgs/by-name/yo/your_spotify/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix index 6bd736ea2701..3dfe972ea7e0 100644 --- a/pkgs/by-name/yo/your_spotify/package.nix +++ b/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 = [ From a8e2ff4683df34fa2901aa93a1cbacadd4092ede Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 27 Apr 2025 20:44:04 +0300 Subject: [PATCH 4/9] secretscanner: build with vectorscan instead of hyperscan See https://github.com/NixOS/nixpkgs/issues/310772 for context. This brings us aarch64-linux support for free. --- pkgs/by-name/se/secretscanner/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/secretscanner/package.nix b/pkgs/by-name/se/secretscanner/package.nix index 356ecd9102f3..be6f24c530ff 100644 --- a/pkgs/by-name/se/secretscanner/package.nix +++ b/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 ]; }; From 6706d2863be21ca2f96ed044df889b2753280e58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Apr 2025 22:59:03 +0000 Subject: [PATCH 5/9] python312Packages.onedrive-personal-sdk: 0.0.13 -> 0.0.14 --- .../python-modules/onedrive-personal-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix index 635ec7a857aa..73d47cff1c08 100644 --- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix +++ b/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 ]; From 3622ab91671fb0464b9325b876b8c5b53f16f4c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Apr 2025 01:05:33 +0000 Subject: [PATCH 6/9] wxmaxima: 25.01.0 -> 25.04.0 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index d9db711638e6..7feac844d1f8 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/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 = [ From 30d98e60da1f5359da530f42a75b55b56c425ec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Apr 2025 10:19:45 +0200 Subject: [PATCH 7/9] forbidden: refactor --- pkgs/by-name/fo/forbidden/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index 89dce3735a03..5f3b25083c25 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -1,7 +1,7 @@ { lib, - python3, fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,25 +20,26 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ alive-progress + bot-safe-agents colorama + cryptography pycurl pyjwt regex requests tabulate termcolor - bot-safe-agents - cryptography ]; - pythonImportsCheck = [ - "forbidden" - ]; + # Project has no tests + doCheck = false; + + 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}"; + changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "forbidden"; From 7aa91c307d9af07d6900b337cecd02da067e8433 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Mon, 28 Apr 2025 11:15:04 +0200 Subject: [PATCH 8/9] yaziPlugins.rsync: init at 0-unstable-2025-04-12 --- .../by-name/ya/yazi/plugins/rsync/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pkgs/by-name/ya/yazi/plugins/rsync/default.nix diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix new file mode 100644 index 000000000000..349d06f38b9a --- /dev/null +++ b/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 ]; + }; +} From 5dc7eab0be2ed2fe34ff7ec10c295f0562c76a4b Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 28 Apr 2025 12:21:27 +0300 Subject: [PATCH 9/9] Revert "slint-viewer: init at 1.10.0" --- maintainers/maintainer-list.nix | 7 ---- pkgs/by-name/sl/slint-viewer/package.nix | 52 ------------------------ 2 files changed, 59 deletions(-) delete mode 100644 pkgs/by-name/sl/slint-viewer/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f6b1b510da2..6116ea0a9d32 100644 --- a/maintainers/maintainer-list.nix +++ b/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"; diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix deleted file mode 100644 index 09b252ec294c..000000000000 --- a/pkgs/by-name/sl/slint-viewer/package.nix +++ /dev/null @@ -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 ]; - }; -})