Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions pkgs/development/python-modules/cryptography/vectors.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@ buildPythonPackage rec {

sourceRoot = "${src.name}/vectors";

patches = [
# https://github.com/NixOS/nixpkgs/pull/449568
(fetchpatch2 {
name = "uv-build.patch";
url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1";
stripLen = 1;
includes = [ "pyproject.toml" ];
hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "uv_build>=0.7.19,<0.9.0" "uv_build>=0.7.19,<0.11.0"
'';

build-system = [ uv-build ];

Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/uv-build/built-by-uv.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
buildPythonPackage,
uv,
uv-build,
anyio,
pytestCheckHook,
Expand All @@ -10,7 +9,7 @@ buildPythonPackage {
version = "0.1.0";
pyproject = true;

src = "${uv.src}/scripts/packages/built-by-uv";
src = "${uv-build.src}/test/packages/built-by-uv";

build-system = [ uv-build ];

Expand Down
16 changes: 8 additions & 8 deletions pkgs/development/python-modules/uv-build/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
callPackage,
}:

buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "uv-build";
version = "0.9.26";
version = "0.10.0";
pyproject = true;

src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
tag = version;
hash = "sha256-qvfMB62/0Hvc7m5h+QitvUcS6YZWAV1uGPg8JpCKPNU=";
tag = finalAttrs.version;
hash = "sha256-nD26zqKMK5LNkeYdqVYteeYL4mYaQQ/QlyjbMDDhLAY=";
};

nativeBuildInputs = [
Expand All @@ -25,8 +25,8 @@ buildPythonPackage rec {
];

cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
hash = "sha256-3ncKhauappl1MR3EG1bwYVrwhM7gCFRcRyRvYrsDaok=";
inherit (finalAttrs) pname version src;
hash = "sha256-lEynVemQHCI7ZKD2+1n4K/AtEYRld2+aRLkDMSX8ejM=";
};

buildAndTestSubdir = "crates/uv-build";
Expand All @@ -41,7 +41,7 @@ buildPythonPackage rec {

# Run the tests of a package built by `uv_build`.
passthru = {
tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; };
tests.built-by-uv = callPackage ./built-by-uv.nix { };

# updateScript is not needed here, as updating is done on staging
};
Expand All @@ -52,4 +52,4 @@ buildPythonPackage rec {
inherit (pkgs.uv.meta) changelog license;
maintainers = with lib.maintainers; [ bengsparks ];
};
}
})
Loading