From 608908ed7a44d8c4bebdd95832b6bdb27d10ab92 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 22 Apr 2023 16:45:13 +0200
Subject: [PATCH] lit: move to python-modules

---
 pkgs/applications/science/logic/klee/default.nix     |  2 +-
 .../{tools/misc => python-modules}/lit/default.nix   | 12 ++++++++----
 pkgs/top-level/all-packages.nix                      |  2 +-
 pkgs/top-level/python-packages.nix                   |  2 ++
 4 files changed, 12 insertions(+), 6 deletions(-)
 rename pkgs/development/{tools/misc => python-modules}/lit/default.nix (85%)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index 898e344f2a45..a82d9c51e3be 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
     # Should appear BEFORE lit, since lit passes through python rather
     # than the python environment we make.
     kleePython
-    (lit.override { python3 = kleePython; })
+    (lit.override { python = kleePython; })
   ];
 
   cmakeFlags = let
diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/python-modules/lit/default.nix
similarity index 85%
rename from pkgs/development/tools/misc/lit/default.nix
rename to pkgs/development/python-modules/lit/default.nix
index 5a255df46806..b4dee1e20b55 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/python-modules/lit/default.nix
@@ -1,16 +1,20 @@
-{ lib, python3 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:
 
-python3.pkgs.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "lit";
   version = "15.0.6";
 
-  src = python3.pkgs.fetchPypi {
+  src = fetchPypi {
     inherit pname version;
     hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k=";
   };
 
   passthru = {
-    python = python3;
+    inherit python;
   };
 
   # Non-standard test suite. Needs custom checkPhase.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab2a07cf481e..84c9d382f3d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18517,7 +18517,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  lit = callPackage ../development/tools/misc/lit { };
+  lit = with python3Packages; toPythonApplication lit;
 
   litecli = callPackage ../development/tools/database/litecli { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0b350e983bf..428ef9bf5249 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5678,6 +5678,8 @@ self: super: with self; {
     python3 = python;
   });
 
+  lit = callPackage ../development/python-modules/lit { };
+
   littleutils = callPackage ../development/python-modules/littleutils { };
 
   livelossplot = callPackage ../development/python-modules/livelossplot { };