diff --git a/pkgs/development/python-modules/icdiff/default.nix b/pkgs/development/python-modules/icdiff/default.nix index e9f804078807..89587e1f8749 100644 --- a/pkgs/development/python-modules/icdiff/default.nix +++ b/pkgs/development/python-modules/icdiff/default.nix @@ -16,27 +16,19 @@ in buildPythonPackage rec { pname = "icdiff"; - version = "2.0.8-unstable-2025-11-11"; + version = "2.0.9"; pyproject = true; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; - rev = "ee4643ae3976ca023dab534eb59b911f16f762ac"; - hash = "sha256-XV88WjZDc2NSQ5CEahr8KXLXrBACvIWOavMUPeoPGOw="; - leaveDotGit = true; + tag = "release-${version}"; + hash = "sha256-ykQLF2b47RZSlrJXYpZ03evhpcGfVyTYwpO2UbmWqrY="; + deepClone = true; }; patches = [ ./0001-Don-t-test-black-or-flake8.patch ]; - postPatch = '' - substituteInPlace test.sh \ - --replace-fail "check_gold 1 gold-exclude.txt" "# check_gold 1 gold-exclude.txt" \ - --replace-fail "check_gold 1 gold-strip-cr-off.txt" "# check_gold 1 gold-strip-cr-off.txt" \ - --replace-fail "check_gold 1 gold-strip-cr-on.txt" "# check_gold 1 gold-strip-cr-on.txt" \ - --replace-fail "check_gold 1 gold-no-cr-indent" "# check_gold 1 gold-no-cr-indent" - ''; - build-system = [ setuptools ]; pythonImportsCheck = [ "icdiff" ]; @@ -48,13 +40,17 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; + # Before the wheel gets created, fix up the shebangs. + preBuild = '' + patchShebangs test.sh icdiff git-icdiff + ''; + # Odd behavior in the sandbox doCheck = !stdenv.hostPlatform.isDarwin; checkPhase = '' runHook preCheck - patchShebangs test.sh ./test.sh ${python.interpreter} runHook postCheck