From 24563bbb0fb035482f2727366d94c2c0a236b136 Mon Sep 17 00:00:00 2001 From: quasigod Date: Fri, 20 Jun 2025 15:49:39 -0400 Subject: [PATCH 1/8] python313Packages.ldapdomaindump: 0.9.4 -> 0.10.0-unstable-2025-04-06 --- .../python-modules/ldapdomaindump/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix index e154108d063c..a762297e9951 100644 --- a/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -1,28 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, dnspython, - future, ldap3, pythonOlder, }: buildPythonPackage rec { pname = "ldapdomaindump"; - version = "0.9.4"; + version = "0.10.0-unstable-2025-04-06"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-mdzaFwUKllSZZuU7yJ5x2mcAlNU9lUKzsNAZfQNeb1I="; + src = fetchFromGitHub { + owner = "dirkjanm"; + repo = "ldapdomaindump"; + rev = "d559463eb29857f2660bf3867bfb9f8610d1ddb1"; + hash = "sha256-gb/3gtXPQ86bkvunvj1wonxYAFHKkCh2H5dmSNTgz5g="; }; propagatedBuildInputs = [ dnspython - future ldap3 ]; From 26839daeca4d151d77628625603e7a8eaf4e6787 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 11:35:53 +0200 Subject: [PATCH 2/8] python313Packages.ldapdomaindump: refactor - adopt --- .../python-modules/ldapdomaindump/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ldapdomaindump/default.nix b/pkgs/development/python-modules/ldapdomaindump/default.nix index a762297e9951..b81b2dddafa8 100644 --- a/pkgs/development/python-modules/ldapdomaindump/default.nix +++ b/pkgs/development/python-modules/ldapdomaindump/default.nix @@ -4,15 +4,13 @@ fetchFromGitHub, dnspython, ldap3, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "ldapdomaindump"; version = "0.10.0-unstable-2025-04-06"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "dirkjanm"; @@ -21,12 +19,14 @@ buildPythonPackage rec { hash = "sha256-gb/3gtXPQ86bkvunvj1wonxYAFHKkCh2H5dmSNTgz5g="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dnspython ldap3 ]; - # requires ldap server + # Tests require LDAP server doCheck = false; pythonImportsCheck = [ "ldapdomaindump" ]; @@ -34,8 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "Active Directory information dumper via LDAP"; homepage = "https://github.com/dirkjanm/ldapdomaindump/"; - changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/v${version}"; + changelog = "https://github.com/dirkjanm/ldapdomaindump/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ fab ]; }; } From 0fbd540abe0adcdef774165ce1bcc8bc2affdd72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 12:08:53 +0200 Subject: [PATCH 3/8] python313Packages.oracledb: 3.1.0 -> 3.2.0 Changelog: https://github.com/oracle/python-oracledb/blob/v3.2.0/doc/src/release_notes.rst --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index 680c4aba390b..682170154934 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "3.1.0"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-94z3RSEo+lZKmBnSE1c6fJPjsFOysu9QXxg85+R7Hns="; + hash = "sha256-m/nxyT5TFCsz0cXr9aur7r0gYqAdXq1ou7ZAQ57PIiM="; }; build-system = [ From d45251f0333f38262c65e03de85b7ae6e5e30a0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 13:29:50 +0200 Subject: [PATCH 4/8] pre2k: refactor --- pkgs/by-name/pr/pre2k/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index 1f8a008220ae..da83ea80b9f6 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -23,11 +23,9 @@ python3.pkgs.buildPythonApplication rec { "typer" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ impacket ldap3 pyasn1 @@ -35,14 +33,12 @@ python3.pkgs.buildPythonApplication rec { typer ]; - pythonImportsCheck = [ - "pre2k" - ]; + pythonImportsCheck = [ "pre2k" ]; meta = { description = "Tool to query for the existence of pre-windows 2000 computer objects"; homepage = "https://github.com/garrettfoster13/pre2k"; - changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${version}"; + changelog = "https://github.com/garrettfoster13/pre2k/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pre2k"; From ed6840a95c30ff189b16fa336125604b4fa3dffd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 13:51:26 +0200 Subject: [PATCH 5/8] python313Packages.patator: mark as broken Still uses cx-oracle which is broken and was replaced by oracledb https://github.com/lanjelot/patator/issues/234 --- pkgs/development/python-modules/patator/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index c4ce6f7afbb8..b944a61c3586 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -61,5 +61,8 @@ buildPythonPackage rec { homepage = "https://github.com/lanjelot/patator"; license = licenses.gpl2Only; maintainers = with maintainers; [ y0no ]; + # Still uses cx-oracle which is broken and was replaced by oracledb + # https://github.com/lanjelot/patator/issues/234 + broken = true; }; } From 18e8dc539ce7f9498750ac80e868546d47204ff6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 15:37:12 +0200 Subject: [PATCH 6/8] certsync: 1.5-unstable-2024-03-08 -> 0.1.6 Changelog: https://github.com/zblurx/certsync/releases/tag/0.1.6 --- pkgs/by-name/ce/certsync/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ce/certsync/package.nix b/pkgs/by-name/ce/certsync/package.nix index e0913596154b..1b059153ab36 100644 --- a/pkgs/by-name/ce/certsync/package.nix +++ b/pkgs/by-name/ce/certsync/package.nix @@ -4,34 +4,33 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication rec { pname = "certsync"; - version = "1.5-unstable-2024-03-08"; + version = "0.1.6"; pyproject = true; src = fetchFromGitHub { owner = "zblurx"; repo = "certsync"; - rev = "712e34c54a63537efd630561aa55dc9d35962c3f"; - hash = "sha256-YkxEExeu3sBJ93WJGtU5oe3rDS0Ki88vAeGpE23xRwo="; + tag = version; + hash = "sha256-UNeO9Ldf6h6ykziKVCdAoBIzL5QedbRLFEwyeWDCtUU="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + pythonRelaxDeps = [ "certipy-ad" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ certipy-ad tqdm ]; - pythonImportsCheck = [ - "certsync" - ]; + pythonImportsCheck = [ "certsync" ]; meta = with lib; { description = "Dump NTDS with golden certificates and UnPAC the hash"; homepage = "https://github.com/zblurx/certsync"; + changelog = "https://github.com/zblurx/certsync/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "certsync"; From f995bf66e59d1fd73eb170e2fa05545099d2ce18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 16:50:54 +0200 Subject: [PATCH 7/8] breads-ad: relax ldap3 --- pkgs/by-name/br/breads-ad/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/breads-ad/package.nix b/pkgs/by-name/br/breads-ad/package.nix index 83d446a62fd5..2f797fb130ba 100644 --- a/pkgs/by-name/br/breads-ad/package.nix +++ b/pkgs/by-name/br/breads-ad/package.nix @@ -16,9 +16,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-U1q15D59N55qBf4NVOpe5RpQjlE1ye2TNNIZf2IZV3U="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + pythonRelaxDeps = [ "ldap3" ]; + + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ impacket From 6a2fd1d4df7c5c90ccb636bff8ac4ab1e7ce75fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Jul 2025 16:52:36 +0200 Subject: [PATCH 8/8] pre2k: relax ldap3 --- pkgs/by-name/pr/pre2k/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pre2k/package.nix b/pkgs/by-name/pr/pre2k/package.nix index da83ea80b9f6..46a5d3fc9de1 100644 --- a/pkgs/by-name/pr/pre2k/package.nix +++ b/pkgs/by-name/pr/pre2k/package.nix @@ -18,6 +18,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "impacket" + "ldap3" "pyasn1" "rich" "typer"