push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 29 May 2025 14:47:58 -0700
Subject: [PATCH] Don't test black or flake8
Signed-off-by: Philip Taron <philip.taron@gmail.com>
---
test.sh | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/test.sh b/test.sh
index 1dd6c4be579e8a61d2d284b042c54cd2a1e0ff77..dc9ecab4a9097878a0a65c45df38a4fa25eb9fa2 100755
--- a/test.sh
+++ b/test.sh
@@ -210,20 +210,6 @@ function ensure_installed() {
fi
}
-ensure_installed "black"
-echo 'Running black formatter...'
-if ! black icdiff --quiet --line-length 79 --check; then
- echo ""
- echo 'Consider running `black icdiff --line-length 79`'
- fail
-fi
-
-ensure_installed "flake8"
-echo 'Running flake8 linter...'
-if ! flake8 icdiff; then
- fail
-fi
-
if ! $REGOLD; then
echo PASS
fi

View File

@@ -0,0 +1,61 @@
{
lib,
stdenv,
python,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
writableTmpDirAsHomeHook,
pkgs,
}:
let
inherit (pkgs) bash git less;
in
buildPythonPackage rec {
pname = "icdiff";
version = "2.0.7";
pyproject = true;
src = fetchFromGitHub {
owner = "jeffkaufman";
repo = "icdiff";
tag = "release-${version}";
hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08=";
leaveDotGit = true;
};
patches = [ ./0001-Don-t-test-black-or-flake8.patch ];
build-system = [ setuptools ];
pythonImportsCheck = [ "icdiff" ];
nativeCheckInputs = [
bash
git
less
writableTmpDirAsHomeHook
];
# Odd behavior in the sandbox
doCheck = !stdenv.hostPlatform.isDarwin;
checkPhase = ''
runHook preCheck
patchShebangs test.sh
./test.sh ${python.interpreter}
runHook postCheck
'';
meta = {
description = "Improved colorized diff";
homepage = "https://github.com/jeffkaufman/icdiff";
changelog = "https://github.com/jeffkaufman/icdiff/releases/tag/release-${version}/CHANGELOG.md";
license = lib.licenses.psfl;
maintainers = with lib.maintainers; [ philiptaron ];
};
}