From 6b0494cbcc4a93e66f6862c140a2bc1205e9dc84 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 27 Oct 2022 09:36:59 +0200 Subject: git-remote-codecommit: fix build - Don't call from a different scope - Disable catching of conflicts because we do get a (installation-time only) conflict due to overrides in awscli. --- .../git-and-tools/git-remote-codecommit/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix index e5e41ac7232af..8ada5cc42f54e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix @@ -1,11 +1,19 @@ -{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, botocore, pytest, mock -, flake8, tox, awscli }: +{ lib, fetchFromGitHub, python3Packages, awscli }: + +with python3Packages; buildPythonApplication rec { pname = "git-remote-codecommit"; version = "1.15.1"; disabled = !isPy3k; + # The check dependency awscli has some overrides + # which yield a different botocore. + # This results in a duplicate version during installation + # of the wheel, even though it does not matter + # because it is only a test dependency. + catchConflicts = false; + src = fetchFromGitHub { owner = "aws"; repo = pname; -- cgit 1.4.1