From e414edaa0d145f6207d17bad98f51b66e78b3854 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 20 Aug 2024 23:50:08 +0200
Subject: [PATCH] cbeams: migrate to pkgs/by-name, modernize

---
 .../cbeams/default.nix => by-name/cb/cbeams/package.nix}  | 8 ++++----
 pkgs/top-level/python-packages.nix                        | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{misc/cbeams/default.nix => by-name/cb/cbeams/package.nix} (73%)

diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/by-name/cb/cbeams/package.nix
similarity index 73%
rename from pkgs/misc/cbeams/default.nix
rename to pkgs/by-name/cb/cbeams/package.nix
index 2c473bdf3b03..fe2463dbc36c 100644
--- a/pkgs/misc/cbeams/default.nix
+++ b/pkgs/by-name/cb/cbeams/package.nix
@@ -1,9 +1,9 @@
-{ lib, buildPythonApplication, fetchPypi, isPy3k, blessed, docopt }:
+{ lib, python3Packages, fetchPypi }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cbeams";
   version = "1.0.3";
-  disabled = !isPy3k;
+  disabled = !python3Packages.isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -15,7 +15,7 @@ buildPythonApplication rec {
       --replace-fail "blessings" "blessed"
   '';
 
-  propagatedBuildInputs = [ blessed docopt ];
+  propagatedBuildInputs = with python3Packages; [ blessed docopt ];
 
   meta = with lib; {
     homepage = "https://github.com/tartley/cbeams";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1299e5f1ded..1e4b8d33d017 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2027,8 +2027,6 @@ self: super: with self; {
 
   cattrs = callPackage ../development/python-modules/cattrs { };
 
-  cbeams = callPackage ../misc/cbeams { };
-
   cbor2 = callPackage ../development/python-modules/cbor2 { };
 
   cbor = callPackage ../development/python-modules/cbor { };