From b2701cdfbd714f65c7c4fd347ff5e6ab6e3fe8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Jul 2024 07:30:01 -0700 Subject: [PATCH] rockcraft: use packageOverrides --- pkgs/by-name/ro/rockcraft/package.nix | 36 +++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 2443a887a321..80497fea6e26 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -1,13 +1,34 @@ { lib, - python3Packages, + python3, fetchFromGitHub, dpkg, nix-update-script, - python3, }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + craft-application = super.craft-application.overridePythonAttrs (old: rec { + version = "1.2.1"; + src = fetchFromGitHub { + owner = "canonical"; + repo = "craft-application"; + rev = "refs/tags/${version}"; + hash = "sha256-CXZEWVoE66dlQJp4G8tinufjyaDJaH1Muxz/qd/81oA="; + }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==67.7.2" "setuptools" + ''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "rockcraft"; version = "1.2.3"; @@ -26,20 +47,21 @@ python3Packages.buildPythonApplication rec { --replace-fail "distutils.util" "setuptools.dist" ''; - propagatedBuildInputs = with python3Packages; [ - craft-application-1 + build-system = with python.pkgs; [ setuptools-scm ]; + + dependencies = with python.pkgs; [ + craft-application craft-archives spdx-lookup ]; nativeCheckInputs = - with python3Packages; + with python.pkgs; [ pytest-check pytest-mock pytest-subprocess pytestCheckHook - setuptools ] ++ [ dpkg ];