From 2c6add1698cdbbea0dd7966490ea7a17504b6359 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 9 Dec 2025 09:03:56 +0100 Subject: [PATCH 1/4] python313Packages.publicsuffix2: devendor publicsuffix-list --- pkgs/development/python-modules/publicsuffix2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index c11880a620c3..cb845c249d50 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + publicsuffix-list, }: let tagVersion = "2.2019-12-21"; @@ -27,6 +28,9 @@ buildPythonPackage { # only used to update the interal publicsuffix list substituteInPlace setup.py \ --replace "'requests >= 2.7.0'," "" + + rm src/publicsuffix2/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat src/publicsuffix2/public_suffix_list.dat ''; pythonImportsCheck = [ "publicsuffix2" ]; From d4bc14442b251ff5006bb0142a50291f6cf2891c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 9 Dec 2025 09:16:40 +0100 Subject: [PATCH 2/4] python313Packages.publicsuffix: devendor publicsuffix-list --- pkgs/development/python-modules/publicsuffix/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index c0f0d87477ff..8f86b316a079 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -4,6 +4,7 @@ fetchPypi, setuptools, pythonOlder, + publicsuffix-list, }: buildPythonPackage rec { @@ -22,6 +23,9 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/def test_fetch/i\\ \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py + + rm publicsuffix/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffix/public_suffix_list.dat ''; build-system = [ setuptools ]; From c006704f8cfe55d3b6a252ce2b8500a2228600d6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 9 Dec 2025 10:27:24 +0100 Subject: [PATCH 3/4] python313Packages.publicsuffixlist: devendor publicsuffix-list --- .../development/python-modules/publicsuffixlist/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 9b8fa918ca65..324eb812d64d 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -6,6 +6,7 @@ pytestCheckHook, requests, setuptools, + publicsuffix-list, }: buildPythonPackage rec { @@ -18,6 +19,11 @@ buildPythonPackage rec { hash = "sha256-RYvLtdaQV+XXbIuLYdXKocmYEE71eIuV2KJlVhaW+nY="; }; + postPatch = '' + rm publicsuffixlist/public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat publicsuffixlist/public_suffix_list.dat + ''; + build-system = [ setuptools ]; optional-dependencies = { From dc41300694215304f832995441f03a231fb66274 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 9 Dec 2025 10:36:59 +0100 Subject: [PATCH 4/4] libnspsl: devendor publicsuffix-list --- pkgs/by-name/li/libnspsl/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/li/libnspsl/package.nix b/pkgs/by-name/li/libnspsl/package.nix index a7905669ef5d..7206b5358b44 100644 --- a/pkgs/by-name/li/libnspsl/package.nix +++ b/pkgs/by-name/li/libnspsl/package.nix @@ -4,6 +4,7 @@ fetchurl, pkg-config, netsurf-buildsystem, + publicsuffix-list, }: stdenv.mkDerivation (finalAttrs: { @@ -15,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NoTOwy9VXa7UMZk+C/bL2TdPbJCERiN+CJ8LYdaUrIA="; }; + postPatch = '' + rm public_suffix_list.dat + ln -s ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat public_suffix_list.dat + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ netsurf-buildsystem ];