glasgow: move out of python3Packages

It is a command line tool, not a Python module.

pkgs/tools/misc/glasgow/default.nix

@@ -1,26 +1,15 @@
 { lib
-, buildPythonPackage
+, python3
 , fetchFromGitHub
-, setuptools
-, setuptools-scm
-, pythonOlder
 , sdcc
-, amaranth
-, fx2
-, libusb1
-, aiohttp
-, pyvcd
-, bitarray
-, crcmod
 , yosys
 , icestorm
 , nextpnr
 }:
 
-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "glasgow";
   version = "unstable-2021-12-12";
-  disabled = pythonOlder "3.7";
   # python software/setup.py --version
   realVersion = "0.1.dev1679+g${lib.substring 0 7 src.rev}";
 
@@ -31,9 +20,9 @@ buildPythonPackage rec {
     sha256 = "EsQ9ZjalKDQ54JOonra4yPDI56cF5n86y/Rd798cZsU=";
   };
 
-  nativeBuildInputs = [ setuptools-scm sdcc ];
+  nativeBuildInputs = [ python3.pkgs.setuptools-scm sdcc ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     setuptools
     amaranth
     fx2
@@ -49,7 +38,7 @@ buildPythonPackage rec {
   enableParallelBuilding = true;
 
   preBuild = ''
-    make -C firmware LIBFX2=${fx2}/share/libfx2
+    make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2
     cp firmware/glasgow.ihex software/glasgow
     cd software
     export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
@@ -59,7 +48,7 @@ buildPythonPackage rec {
   doInstallCheck = false;
 
   checkPhase = ''
-    python -W ignore::DeprecationWarning test.py
+    ${python3.interpreter} -W ignore::DeprecationWarning test.py
   '';
 
   makeWrapperArgs = [

pkgs/top-level/all-packages.nix

@@ -3254,7 +3254,7 @@ with pkgs;
 
   glances = python3Packages.callPackage ../applications/system/glances { };
 
-  glasgow = with python3Packages; toPythonApplication glasgow;
+  glasgow = callPackage ../tools/misc/glasgow { };
 
   glasstty-ttf = callPackage ../data/fonts/glasstty-ttf { };
 

pkgs/top-level/python-aliases.nix

@@ -97,6 +97,7 @@ mapAliases ({
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   GitPython = gitpython; # added 2022-10-28
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
+  glasgow = throw "glasgow has been promoted to a top-level attribute"; # added 2023-02-05
   google_api_python_client = google-api-python-client; # added 2021-03-19
   googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
   graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10

pkgs/top-level/python-packages.nix

@@ -3866,8 +3866,6 @@ self: super: with self; {
 
   glances-api = callPackage ../development/python-modules/glances-api { };
 
-  glasgow = callPackage ../development/python-modules/glasgow { };
-
   glcontext = callPackage ../development/python-modules/glcontext { };
 
   glean-parser = callPackage ../development/python-modules/glean-parser { };