diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index 75055f7d62fc..1216e64477a3 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, }: python3Packages.buildPythonApplication rec { @@ -16,6 +17,15 @@ python3Packages.buildPythonApplication rec { hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4="; }; + patches = [ + # https://github.com/acarapetis/jj-pre-push/pull/2 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/jj-pre-push/commit/aa2d917ec9560318178fbc1040281228db7b7ec1.patch?full_index=1"; + hash = "sha256-uNqOO0yVHShcXxYMPFcPCDM5YlL4IcmpUAfClmDlJ4Q="; + }) + ]; + build-system = [ python3Packages.uv-build ]; diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 8122b1afea86..230079fc6aba 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.8.23"; + version = "0.9.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-5L/FipR5MPsscpWfpDURbC5qwn6XB5KoOrjedk1HzDo="; + hash = "sha256-YDpaDArhw0QmJ7fmoNZAewOQx+cMnxW+xhdCL3zQ9GI="; }; - cargoHash = "sha256-JHfqsT/W7RvoHx9WbA4fdQZw2/+BOSRuGV3mcMx1FN4="; + cargoHash = "sha256-eHkEUG2Er6qN8JcUaEyJSec6L9cMI4EebNrdv4UJIUk="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index 189729fb9bd7..bcfa798f614d 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, construct, fetchFromGitHub, + fetchpatch2, pytestCheckHook, uv-build, }: @@ -19,6 +20,14 @@ buildPythonPackage rec { hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/matejcik/construct-classes/commit/d1ecacc0cf5cb332ffe6ed85ce9dfc552f77231f.patch?full_index=1"; + hash = "sha256-VeifL8bER0mIRNXKTA+/cje8AxWJKg/q8ipmf3gTeiw="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ construct ]; diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix index 62abd28fde23..1edf6d8332f3 100644 --- a/pkgs/development/python-modules/django-bootstrap3/default.nix +++ b/pkgs/development/python-modules/django-bootstrap3/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system uv-build, @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo="; }; + patches = [ + # https://github.com/zostera/django-bootstrap3/pull/1085 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap3/commit/d3285ad9c3de87aa763bb49b9666baed514f7c87.patch?full_index=1"; + hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 389aaf503a41..348ae60e5095 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system uv-build, @@ -29,6 +30,15 @@ buildPythonPackage rec { hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4="; }; + patches = [ + # https://github.com/zostera/django-bootstrap4/pull/826 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap4/commit/e3e6b7cc6720568177d37ff0998007c84c294c5a.patch?full_index=1"; + hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix index a3a67ada4c95..9327c112676e 100644 --- a/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, django, fetchFromGitHub, + fetchpatch2, jinja2, pillow, pytest-django, @@ -23,6 +24,15 @@ buildPythonPackage rec { hash = "sha256-aqP2IkAkZsw5vbQxhiy9L3giSgb0seub9gsxPTajiXo="; }; + patches = [ + # https://github.com/zostera/django-bootstrap5/pull/769 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/django-bootstrap5/commit/e588b25e0c81d9133ca2b9391c125b41d485aefc.patch?full_index=1"; + hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ django ]; diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 23bc6a0eca9e..d32f91464da2 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pythonOlder, uv-build, pytestCheckHook, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-XFC7f8wdIsySIn4qXqo61GmRcaF0QciLYN5lwhzlIuA="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Ch00k/ffmpy/commit/11a053d11939b488ce7ac362589372904218a798.patch?full_index=1"; + hash = "sha256-78D64uSX03zp2VM7h3hg493Vtow8fh+tQWXkzVgokDA="; + }) + ]; + postPatch = # Default to store ffmpeg. '' diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index ef2f8aa953f5..5c625b117c7b 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -3,6 +3,7 @@ anyio, buildPythonPackage, fetchFromGitHub, + fetchpatch2, hishel, httpx, pydantic, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-67Y0r4Po3z4YmnbWC0HBLmsKD68HMIGvHKo5SLe+KRc="; }; + patches = [ + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/yanyongyu/githubkit/commit/2817664d904541242d4cedf7aae85cd4c4b606e2.patch?full_index=1"; + hash = "sha256-mmtjlebHZpHX457frSOe88tsUo7iNdSIUynGZjcjuw4="; + }) + ]; + pythonRelaxDeps = [ "hishel" ]; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3cf144ae9961..24e51364669b 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch2, fetchPypi, pythonOlder, @@ -42,6 +43,15 @@ buildPythonPackage rec { hash = "sha256-cmkz/ZyVYfpz4yOxghsXPF4PhRluwqSXo1CcwvwkXFg="; }; + patches = [ + # https://github.com/marimo-team/marimo/pull/6714 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/marimo/commit/b1c690e82e8117c451a74fdf172eb51a4861853d.patch?full_index=1"; + hash = "sha256-iFS5NSGjaGdECRk0LCRSA8XzRb1/sVSZCTRLy6taHNU="; + }) + ]; + build-system = [ uv-build ]; dependencies = [ diff --git a/pkgs/development/python-modules/sigstore-models/default.nix b/pkgs/development/python-modules/sigstore-models/default.nix index 2a45c9cdef5a..5bda1519e17d 100644 --- a/pkgs/development/python-modules/sigstore-models/default.nix +++ b/pkgs/development/python-modules/sigstore-models/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pydantic, typing-extensions, uv-build, @@ -20,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-zlIZzfgHZPEuiZu3JNX74Cg1jPNaO1HUhMtpxoyOoqk="; }; + patches = [ + # https://github.com/astral-sh/sigstore-models/pull/4 + (fetchpatch2 { + name = "uv-build.patch"; + url = "https://github.com/Prince213/sigstore-models/commit/0cbd46ce7ebc8a5d2825b8fc98147a9ba4b3be70.patch?full_index=1"; + hash = "sha256-6DLhhHkGW2Ok9xwKx6YT5BkCqQNH/Ja/KEO9FHl4NXo="; + }) + ]; + build-system = [ uv-build ]; dependencies = [