From fd71527762dfac602126e370369f1f6015a4d7b0 Mon Sep 17 00:00:00 2001 From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com> Date: Sat, 6 Apr 2024 12:30:05 +0100 Subject: [PATCH] Delete Python workaround (#48) --- darwin-configuration.nix | 3 +-- python.nix | 14 -------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 python.nix diff --git a/darwin-configuration.nix b/darwin-configuration.nix index c80a23b..567e50c 100644 --- a/darwin-configuration.nix +++ b/darwin-configuration.nix @@ -1,5 +1,4 @@ {pkgs, ...}: let - python = import ./python.nix {inherit pkgs;}; mbsync = import ./mbsync.nix {inherit pkgs;}; in { nix.useDaemon = true; @@ -12,7 +11,7 @@ in { pkgs.rustup pkgs.libiconv pkgs.clang - python + pkgs.python3 ]; users.users.patrick = { diff --git a/python.nix b/python.nix deleted file mode 100644 index b08f40c..0000000 --- a/python.nix +++ /dev/null @@ -1,14 +0,0 @@ -{pkgs}: let - my-python-packages = python-packages: - with python-packages; [ - pip - mathlibtools - ]; -in let - packageOverrides = self: super: { - # Test failures on darwin ("windows-1252"); just skip pytest - # (required for elan) - beautifulsoup4 = super.beautifulsoup4.overridePythonAttrs (old: {pytestCheckPhase = "true";}); - }; -in - (pkgs.python3.override {inherit packageOverrides;}).withPackages my-python-packages