From a7b2c0fc633baf28533ad4a259ef9fca9af882c4 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Wed, 28 Oct 2026 15:23:48 -0400 Subject: [PATCH] With the latest updates, we no longer need to patch the versions of instawow and aiohttp-client-cache. --- nix/configuration/configuration.nix | 47 ----------------------------- 1 file changed, 47 deletions(-) diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix index acf269f..5f92004 100644 --- a/nix/configuration/configuration.nix +++ b/nix/configuration/configuration.nix @@ -284,53 +284,6 @@ in (disableOptimizations "nototools") # Needs to use the same version of python as the zopfli package (disableOptimizations "lib2geom") # Tests failing: ellipse-test, elliptical-arc-test, line-test, polynomial-test (disableOptimizations "libjpeg_turbo") # Test failing: djpeg12-shared-3x2-float-prog-cmp - (final: prev: { - instawow = prev.instawow.overrideAttrs ( - finalAttrs: prevAttrs: - let - version = "7.2.1"; - in - { - inherit version; - - src = final.fetchFromGitHub { - owner = "layday"; - repo = "instawow"; - tag = "v${finalAttrs.version}"; - hash = "sha256-5y+oJfzWwaUc3p4fzsQ4j8a6YJEsI+3Qy3gK6VPkjA4="; - }; - - propagatedBuildInputs = prevAttrs.propagatedBuildInputs ++ [ final.python3.pkgs.versioningit ]; - - postPatch = '' - # Upstream uses versioningit to set the version - sed -i '/^name =.*/a version = "${version}"' pyproject.toml - sed -i "/dynamic =/,+2d" pyproject.toml - ''; - } - ); - }) - (final: prev: { - pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ - (python-final: python-prev: { - aiohttp-client-cache = python-prev.aiohttp-client-cache.overridePythonAttrs ( - oldAttrs: - let - version = "0.15.0"; - in - { - inherit version; - - src = final.fetchPypi { - pname = "aiohttp_client_cache"; - inherit version; - hash = "sha256-Jk+n1pvNsuT+mZTn9Bq17sfLuipfXiYNRE0AL5Ym43Q="; - }; - } - ); - }) - ]; - }) ]; hardware.firmware =