From 001f6c68061d8e143bd693dc6a34e01404b3e231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Jan 2026 12:49:32 -0800 Subject: [PATCH 1/2] python3Packages.bokeh-sampledata: don't use setuptools-git-versioning --- .../python-modules/bokeh-sampledata/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bokeh-sampledata/default.nix b/pkgs/development/python-modules/bokeh-sampledata/default.nix index 200fa20c4588..aed05725d247 100644 --- a/pkgs/development/python-modules/bokeh-sampledata/default.nix +++ b/pkgs/development/python-modules/bokeh-sampledata/default.nix @@ -5,7 +5,6 @@ # build-system setuptools, - setuptools-git-versioning, # dependencies icalendar, @@ -23,9 +22,14 @@ buildPythonPackage rec { hash = "sha256-a4dK9bh45w8WEzaVrAfhXeOGQvqfrf33I/fUIzOWevQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-git-versioning"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + build-system = [ setuptools - setuptools-git-versioning ]; dependencies = [ From bed6b21f30aa5ea7d00a12a96acb5fd7fc1f4404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Jan 2026 13:34:51 -0800 Subject: [PATCH 2/2] python3Packages.bokeh-sampledata: fetch from GitHub --- .../python-modules/bokeh-sampledata/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bokeh-sampledata/default.nix b/pkgs/development/python-modules/bokeh-sampledata/default.nix index aed05725d247..af783a160c94 100644 --- a/pkgs/development/python-modules/bokeh-sampledata/default.nix +++ b/pkgs/development/python-modules/bokeh-sampledata/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -16,10 +16,11 @@ buildPythonPackage rec { version = "2025.0"; pyproject = true; - src = fetchPypi { - pname = "bokeh_sampledata"; - inherit version; - hash = "sha256-a4dK9bh45w8WEzaVrAfhXeOGQvqfrf33I/fUIzOWevQ="; + src = fetchFromGitHub { + owner = "bokeh"; + repo = "bokeh_sampledata"; + tag = version; + hash = "sha256-gAiiNm9t+4z0aFO6pr8FfYGF04pO7u6Wjsbou+I2blk="; }; postPatch = ''