diff --git a/pkgs/development/python-modules/cryptodatahub/default.nix b/pkgs/development/python-modules/cryptodatahub/default.nix index f1b83ac239f4..cd1870d2a227 100644 --- a/pkgs/development/python-modules/cryptodatahub/default.nix +++ b/pkgs/development/python-modules/cryptodatahub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cryptodatahub"; - version = "1.2.1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptodatahub"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zu8E3k6jHFK+IIHWOalmdv/mPGhT7JjgjFkGiLxA4iI="; + hash = "sha256-iXM3LV/obJu3Rvl57ny7/BJINxK2b+qTgBCyu3BDris="; }; build-system = [ @@ -60,6 +60,8 @@ buildPythonPackage (finalAttrs: { "test/common/test_utils.py" ]; + passthru.updateScript = ./update.sh; + meta = { description = "Repository of cryptography-related data"; homepage = "https://gitlab.com/coroner/cryptodatahub"; diff --git a/pkgs/development/python-modules/cryptodatahub/update.sh b/pkgs/development/python-modules/cryptodatahub/update.sh new file mode 100755 index 000000000000..9575e6ababdb --- /dev/null +++ b/pkgs/development/python-modules/cryptodatahub/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-update + +set -euox pipefail + +nix-update python3Packages.cryptodatahub +nix-update python3Packages.cryptoparser +nix-update python3Packages.cryptolyzer diff --git a/pkgs/development/python-modules/cryptolyzer/default.nix b/pkgs/development/python-modules/cryptolyzer/default.nix index 3acb13a63ce1..1c8747463d0d 100644 --- a/pkgs/development/python-modules/cryptolyzer/default.nix +++ b/pkgs/development/python-modules/cryptolyzer/default.nix @@ -11,6 +11,7 @@ pathlib2, pyfakefs, python-dateutil, + pycryptodome, requests, setuptools, setuptools-scm, @@ -19,21 +20,16 @@ buildPythonPackage (finalAttrs: { pname = "cryptolyzer"; - version = "1.2.1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptolyzer"; tag = "v${finalAttrs.version}"; - hash = "sha256-v+himg/DOBlIRiWBIGkxiahT3JGp384Ed4cUCIq6TOw="; + hash = "sha256-2U+7y88m+r1LzOiDp4QydnlQCjBfN6p56Yh9mZMjnyE="; }; - patches = [ - # https://gitlab.com/coroner/cryptolyzer/-/merge_requests/4 - ./fix-dirs-exclude.patch - ]; - pythonRemoveDeps = [ "bs4" ]; build-system = [ @@ -51,6 +47,7 @@ buildPythonPackage (finalAttrs: { pathlib2 pyfakefs python-dateutil + pycryptodome requests urllib3 ]; @@ -68,6 +65,8 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "cryptolyzer" ]; + passthru.updateScript = ../cryptodatahub/update.sh; + meta = { description = "Cryptographic protocol analyzer"; homepage = "https://gitlab.com/coroner/cryptolyzer"; diff --git a/pkgs/development/python-modules/cryptolyzer/fix-dirs-exclude.patch b/pkgs/development/python-modules/cryptolyzer/fix-dirs-exclude.patch deleted file mode 100644 index 0455c892b993..000000000000 --- a/pkgs/development/python-modules/cryptolyzer/fix-dirs-exclude.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5ba89bc0bcc23fc7e8cd3eefb2d78b5a63f4fc66 Mon Sep 17 00:00:00 2001 -From: Ivan Mincik -Date: Wed, 17 Sep 2025 14:44:15 +0200 -Subject: [PATCH] Fix directories exclude from package - -* correctly exclude submodules directory -* also exclude docs directory ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 96a0fa89..a26ee257 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -106,7 +106,7 @@ technical_name = 'cryptolyzer' - license-files = ['LICENSE.txt'] - - [tool.setuptools.packages.find] --exclude = ['submodules'] -+exclude = ['submodules*', 'docs'] - - [tool.tox] - envlist = [ --- -GitLab - diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index 232c5ada513f..7ff3acdccbfb 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "cryptoparser"; - version = "1.2.1"; + version = "1.5.0"; pyproject = true; src = fetchFromGitLab { owner = "coroner"; repo = "cryptoparser"; tag = "v${finalAttrs.version}"; - hash = "sha256-thhpXfLH5yB3pMUKFrMUJ8+8IGchF813ApKUrN+UuZA="; + hash = "sha256-HlsjenwXFDOA1uK+sn1oDHWxbzxIDriWS6pcZycEsis="; }; patches = [ @@ -62,6 +62,8 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "cryptoparser" ]; + passthru.updateScript = ../cryptodatahub/update.sh; + meta = { description = "Security protocol parser and generator"; homepage = "https://gitlab.com/coroner/cryptoparser";