From e75c8518b380a6de84f99e924b0636d9d60898b0 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 6 Nov 2024 09:42:35 +0100 Subject: [PATCH] overlay: Remove python overrides --- overlays/default.nix | 61 +------------------------------------------- 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/overlays/default.nix b/overlays/default.nix index 5a3176b..0bb80aa 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,4 @@ -final: prev: { +_final: prev: { backscrub = prev.pkgs.callPackage ../pkgs/backscrub { inherit (prev.pkgs) gcc @@ -26,63 +26,4 @@ final: prev: { mapshot = prev.pkgs.callPackage ../pkgs/mapshot { }; factorio = prev.factorio.override { versionsJson = ./factorio.json; }; - - python312 = prev.python312.override { - packageOverrides = _pyfinal: pyprev: { - pyscard = pyprev.pyscard.overrideAttrs (_old: { - version = "2.2.0"; - - src = final.fetchFromGitHub { - owner = "LudovicRousseau"; - repo = "pyscard"; - rev = "refs/tags/2.2.0"; - hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' - substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" - substituteInPlace src/smartcard/scard/winscarddll.c \ - --replace-fail "libpcsclite.so.1" \ - "${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}" - ''; - - preCheck = null; - disabledTests = [ ]; - - }); - }; - }; - python312Packages = final.python312.pkgs; - - python311 = prev.python311.override { - packageOverrides = _pyfinal: pyprev: { - - pyscard = pyprev.pyscard.overrideAttrs (_old: { - version = "2.2.0"; - - src = final.fetchFromGitHub { - owner = "LudovicRousseau"; - repo = "pyscard"; - rev = "refs/tags/2.2.0"; - hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]' - substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG" - substituteInPlace src/smartcard/scard/winscarddll.c \ - --replace-fail "libpcsclite.so.1" \ - "${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}" - ''; - - preCheck = null; - disabledTests = [ ]; - - }); - }; - }; - python311Packages = final.python311.pkgs; }